13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
18
from cStringIO import StringIO
20
21
from bzrlib.lazy_import import lazy_import
21
22
lazy_import(globals(), """
22
from copy import deepcopy
23
from unittest import TestSuite
24
from warnings import warn
23
from itertools import chain
27
24
from bzrlib import (
30
27
config as _mod_config,
35
36
revision as _mod_revision,
41
from bzrlib.config import BranchConfig, TreeConfig
42
from bzrlib.lockable_files import LockableFiles, TransportLock
44
from bzrlib.config import BranchConfig, TransportConfig
45
from bzrlib.tag import (
45
from bzrlib.decorators import needs_read_lock, needs_write_lock
46
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
47
HistoryMissing, InvalidRevisionId,
48
InvalidRevisionNumber, LockError, NoSuchFile,
49
NoSuchRevision, NoWorkingTree, NotVersionedError,
50
NotBranchError, UninitializableFormat,
51
UnlistableStore, UnlistableBranch,
53
from bzrlib.symbol_versioning import (deprecated_function,
57
zero_eight, zero_nine,
59
from bzrlib.trace import mutter, note
54
from bzrlib.decorators import (
59
from bzrlib.hooks import Hooks
60
from bzrlib.inter import InterObject
61
from bzrlib.lock import _RelockDebugMixin, LogicalLockResult
62
from bzrlib import registry
63
from bzrlib.symbol_versioning import (
67
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet
62
70
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
63
71
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
64
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
67
# TODO: Maybe include checks for common corruption of newlines, etc?
69
# TODO: Some operations like log might retrieve the same revisions
70
# repeatedly to calculate deltas. We could perhaps have a weakref
71
# cache in memory to make this faster. In general anything can be
72
# cached in memory between lock and unlock operations. .. nb thats
73
# what the transaction identity map provides
76
######################################################################
72
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
75
class Branch(controldir.ControlComponent):
80
76
"""Branch holding a history of revisions.
83
Base directory/url of the branch.
79
Base directory/url of the branch; using control_url and
80
control_transport is more standardized.
81
:ivar hooks: An instance of BranchHooks.
82
:ivar _master_branch_cache: cached result of get_master_branch, see
85
85
# this is really an instance variable - FIXME move it there
90
def control_transport(self):
91
return self._transport
94
def user_transport(self):
95
return self.bzrdir.user_transport
89
97
def __init__(self, *ignored, **ignored_too):
90
raise NotImplementedError('The Branch class is abstract')
98
self.tags = self._format.make_tags(self)
99
self._revision_history_cache = None
100
self._revision_id_to_revno_cache = None
101
self._partial_revision_id_to_revno_cache = {}
102
self._partial_revision_history_cache = []
103
self._tags_bytes = None
104
self._last_revision_info_cache = None
105
self._master_branch_cache = None
106
self._merge_sorted_revisions_cache = None
108
hooks = Branch.hooks['open']
112
def _open_hook(self):
113
"""Called by init to allow simpler extension of the base class."""
115
def _activate_fallback_location(self, url):
116
"""Activate the branch/repository from url as a fallback repository."""
117
for existing_fallback_repo in self.repository._fallback_repositories:
118
if existing_fallback_repo.user_url == url:
119
# This fallback is already configured. This probably only
120
# happens because BzrDir.sprout is a horrible mess. To avoid
121
# confusing _unstack we don't add this a second time.
122
mutter('duplicate activation of fallback %r on %r', url, self)
124
repo = self._get_fallback_repository(url)
125
if repo.has_same_location(self.repository):
126
raise errors.UnstackableLocationError(self.user_url, url)
127
self.repository.add_fallback_repository(repo)
92
129
def break_lock(self):
93
130
"""Break a lock if one is present from another instance.
103
140
if master is not None:
104
141
master.break_lock()
107
@deprecated_method(zero_eight)
108
def open_downlevel(base):
109
"""Open a branch which may be of an old format."""
110
return Branch.open(base, _unsupported=True)
113
def open(base, _unsupported=False):
143
def _check_stackable_repo(self):
144
if not self.repository._format.supports_external_lookups:
145
raise errors.UnstackableRepositoryFormat(self.repository._format,
146
self.repository.base)
148
def _extend_partial_history(self, stop_index=None, stop_revision=None):
149
"""Extend the partial history to include a given index
151
If a stop_index is supplied, stop when that index has been reached.
152
If a stop_revision is supplied, stop when that revision is
153
encountered. Otherwise, stop when the beginning of history is
156
:param stop_index: The index which should be present. When it is
157
present, history extension will stop.
158
:param stop_revision: The revision id which should be present. When
159
it is encountered, history extension will stop.
161
if len(self._partial_revision_history_cache) == 0:
162
self._partial_revision_history_cache = [self.last_revision()]
163
repository._iter_for_revno(
164
self.repository, self._partial_revision_history_cache,
165
stop_index=stop_index, stop_revision=stop_revision)
166
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
167
self._partial_revision_history_cache.pop()
169
def _get_check_refs(self):
170
"""Get the references needed for check().
174
revid = self.last_revision()
175
return [('revision-existence', revid), ('lefthand-distance', revid)]
178
def open(base, _unsupported=False, possible_transports=None):
114
179
"""Open the branch rooted at base.
116
181
For instance, if the branch is at URL/.bzr/branch,
117
182
Branch.open(URL) -> a Branch instance.
119
control = bzrdir.BzrDir.open(base, _unsupported)
120
return control.open_branch(_unsupported)
123
def open_containing(url):
184
control = bzrdir.BzrDir.open(base, _unsupported,
185
possible_transports=possible_transports)
186
return control.open_branch(unsupported=_unsupported)
189
def open_from_transport(transport, name=None, _unsupported=False):
190
"""Open the branch rooted at transport"""
191
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
192
return control.open_branch(name=name, unsupported=_unsupported)
195
def open_containing(url, possible_transports=None):
124
196
"""Open an existing branch which contains url.
126
198
This probes for a branch at url, and searches upwards from there.
128
200
Basically we keep looking up until we find the control directory or
129
201
run into the root. If there isn't one, raises NotBranchError.
130
If there is one and it is either an unrecognised format or an unsupported
202
If there is one and it is either an unrecognised format or an unsupported
131
203
format, UnknownFormatError or UnsupportedFormatError are raised.
132
204
If there is one, it is returned, along with the unused portion of url.
134
control, relpath = bzrdir.BzrDir.open_containing(url)
206
control, relpath = bzrdir.BzrDir.open_containing(url,
135
208
return control.open_branch(), relpath
138
@deprecated_function(zero_eight)
139
def initialize(base):
140
"""Create a new working tree and branch, rooted at 'base' (url)
142
NOTE: This will soon be deprecated in favour of creation
145
return bzrdir.BzrDir.create_standalone_workingtree(base).branch
147
@deprecated_function(zero_eight)
148
def setup_caching(self, cache_root):
149
"""Subclasses that care about caching should override this, and set
150
up cached stores located under cache_root.
152
NOTE: This is unused.
210
def _push_should_merge_tags(self):
211
"""Should _basic_push merge this branch's tags into the target?
213
The default implementation returns False if this branch has no tags,
214
and True the rest of the time. Subclasses may override this.
216
return self.supports_tags() and self.tags.get_tag_dict()
156
218
def get_config(self):
219
"""Get a bzrlib.config.BranchConfig for this Branch.
221
This can then be used to get and set configuration options for the
224
:return: A bzrlib.config.BranchConfig.
157
226
return BranchConfig(self)
160
return self.get_config().get_nickname()
228
def _get_config(self):
229
"""Get the concrete config for just the config in this branch.
231
This is not intended for client use; see Branch.get_config for the
236
:return: An object supporting get_option and set_option.
238
raise NotImplementedError(self._get_config)
240
def _get_fallback_repository(self, url):
241
"""Get the repository we fallback to at url."""
242
url = urlutils.join(self.base, url)
243
a_branch = Branch.open(url,
244
possible_transports=[self.bzrdir.root_transport])
245
return a_branch.repository
248
def _get_tags_bytes(self):
249
"""Get the bytes of a serialised tags dict.
251
Note that not all branches support tags, nor do all use the same tags
252
logic: this method is specific to BasicTags. Other tag implementations
253
may use the same method name and behave differently, safely, because
254
of the double-dispatch via
255
format.make_tags->tags_instance->get_tags_dict.
257
:return: The bytes of the tags file.
258
:seealso: Branch._set_tags_bytes.
260
if self._tags_bytes is None:
261
self._tags_bytes = self._transport.get_bytes('tags')
262
return self._tags_bytes
264
def _get_nick(self, local=False, possible_transports=None):
265
config = self.get_config()
266
# explicit overrides master, but don't look for master if local is True
267
if not local and not config.has_explicit_nickname():
269
master = self.get_master_branch(possible_transports)
270
if master and self.user_url == master.user_url:
271
raise errors.RecursiveBind(self.user_url)
272
if master is not None:
273
# return the master branch value
275
except errors.RecursiveBind, e:
277
except errors.BzrError, e:
278
# Silently fall back to local implicit nick if the master is
280
mutter("Could not connect to bound branch, "
281
"falling back to local nick.\n " + str(e))
282
return config.get_nickname()
162
284
def _set_nick(self, nick):
163
self.get_config().set_user_option('nickname', nick)
285
self.get_config().set_user_option('nickname', nick, warn_masked=True)
165
287
nick = property(_get_nick, _set_nick)
167
289
def is_locked(self):
168
290
raise NotImplementedError(self.is_locked)
170
def lock_write(self):
292
def _lefthand_history(self, revision_id, last_rev=None,
294
if 'evil' in debug.debug_flags:
295
mutter_callsite(4, "_lefthand_history scales with history.")
296
# stop_revision must be a descendant of last_revision
297
graph = self.repository.get_graph()
298
if last_rev is not None:
299
if not graph.is_ancestor(last_rev, revision_id):
300
# our previous tip is not merged into stop_revision
301
raise errors.DivergedBranches(self, other_branch)
302
# make a new revision history from the graph
303
parents_map = graph.get_parent_map([revision_id])
304
if revision_id not in parents_map:
305
raise errors.NoSuchRevision(self, revision_id)
306
current_rev_id = revision_id
308
check_not_reserved_id = _mod_revision.check_not_reserved_id
309
# Do not include ghosts or graph origin in revision_history
310
while (current_rev_id in parents_map and
311
len(parents_map[current_rev_id]) > 0):
312
check_not_reserved_id(current_rev_id)
313
new_history.append(current_rev_id)
314
current_rev_id = parents_map[current_rev_id][0]
315
parents_map = graph.get_parent_map([current_rev_id])
316
new_history.reverse()
319
def lock_write(self, token=None):
320
"""Lock the branch for write operations.
322
:param token: A token to permit reacquiring a previously held and
324
:return: A BranchWriteLockResult.
171
326
raise NotImplementedError(self.lock_write)
173
328
def lock_read(self):
329
"""Lock the branch for read operations.
331
:return: A bzrlib.lock.LogicalLockResult.
174
333
raise NotImplementedError(self.lock_read)
176
335
def unlock(self):
183
342
def get_physical_lock_status(self):
184
343
raise NotImplementedError(self.get_physical_lock_status)
186
def abspath(self, name):
187
"""Return absolute filename for something in the branch
189
XXX: Robert Collins 20051017 what is this used for? why is it a branch
190
method and not a tree method.
192
raise NotImplementedError(self.abspath)
346
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
347
"""Return the revision_id for a dotted revno.
349
:param revno: a tuple like (1,) or (1,1,2)
350
:param _cache_reverse: a private parameter enabling storage
351
of the reverse mapping in a top level cache. (This should
352
only be done in selective circumstances as we want to
353
avoid having the mapping cached multiple times.)
354
:return: the revision_id
355
:raises errors.NoSuchRevision: if the revno doesn't exist
357
rev_id = self._do_dotted_revno_to_revision_id(revno)
359
self._partial_revision_id_to_revno_cache[rev_id] = revno
362
def _do_dotted_revno_to_revision_id(self, revno):
363
"""Worker function for dotted_revno_to_revision_id.
365
Subclasses should override this if they wish to
366
provide a more efficient implementation.
369
return self.get_rev_id(revno[0])
370
revision_id_to_revno = self.get_revision_id_to_revno_map()
371
revision_ids = [revision_id for revision_id, this_revno
372
in revision_id_to_revno.iteritems()
373
if revno == this_revno]
374
if len(revision_ids) == 1:
375
return revision_ids[0]
377
revno_str = '.'.join(map(str, revno))
378
raise errors.NoSuchRevision(self, revno_str)
381
def revision_id_to_dotted_revno(self, revision_id):
382
"""Given a revision id, return its dotted revno.
384
:return: a tuple like (1,) or (400,1,3).
386
return self._do_revision_id_to_dotted_revno(revision_id)
388
def _do_revision_id_to_dotted_revno(self, revision_id):
389
"""Worker function for revision_id_to_revno."""
390
# Try the caches if they are loaded
391
result = self._partial_revision_id_to_revno_cache.get(revision_id)
392
if result is not None:
394
if self._revision_id_to_revno_cache:
395
result = self._revision_id_to_revno_cache.get(revision_id)
397
raise errors.NoSuchRevision(self, revision_id)
398
# Try the mainline as it's optimised
400
revno = self.revision_id_to_revno(revision_id)
402
except errors.NoSuchRevision:
403
# We need to load and use the full revno map after all
404
result = self.get_revision_id_to_revno_map().get(revision_id)
406
raise errors.NoSuchRevision(self, revision_id)
410
def get_revision_id_to_revno_map(self):
411
"""Return the revision_id => dotted revno map.
413
This will be regenerated on demand, but will be cached.
415
:return: A dictionary mapping revision_id => dotted revno.
416
This dictionary should not be modified by the caller.
418
if self._revision_id_to_revno_cache is not None:
419
mapping = self._revision_id_to_revno_cache
421
mapping = self._gen_revno_map()
422
self._cache_revision_id_to_revno(mapping)
423
# TODO: jam 20070417 Since this is being cached, should we be returning
425
# I would rather not, and instead just declare that users should not
426
# modify the return value.
429
def _gen_revno_map(self):
430
"""Create a new mapping from revision ids to dotted revnos.
432
Dotted revnos are generated based on the current tip in the revision
434
This is the worker function for get_revision_id_to_revno_map, which
435
just caches the return value.
437
:return: A dictionary mapping revision_id => dotted revno.
439
revision_id_to_revno = dict((rev_id, revno)
440
for rev_id, depth, revno, end_of_merge
441
in self.iter_merge_sorted_revisions())
442
return revision_id_to_revno
445
def iter_merge_sorted_revisions(self, start_revision_id=None,
446
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
447
"""Walk the revisions for a branch in merge sorted order.
449
Merge sorted order is the output from a merge-aware,
450
topological sort, i.e. all parents come before their
451
children going forward; the opposite for reverse.
453
:param start_revision_id: the revision_id to begin walking from.
454
If None, the branch tip is used.
455
:param stop_revision_id: the revision_id to terminate the walk
456
after. If None, the rest of history is included.
457
:param stop_rule: if stop_revision_id is not None, the precise rule
458
to use for termination:
459
* 'exclude' - leave the stop revision out of the result (default)
460
* 'include' - the stop revision is the last item in the result
461
* 'with-merges' - include the stop revision and all of its
462
merged revisions in the result
463
* 'with-merges-without-common-ancestry' - filter out revisions
464
that are in both ancestries
465
:param direction: either 'reverse' or 'forward':
466
* reverse means return the start_revision_id first, i.e.
467
start at the most recent revision and go backwards in history
468
* forward returns tuples in the opposite order to reverse.
469
Note in particular that forward does *not* do any intelligent
470
ordering w.r.t. depth as some clients of this API may like.
471
(If required, that ought to be done at higher layers.)
473
:return: an iterator over (revision_id, depth, revno, end_of_merge)
476
* revision_id: the unique id of the revision
477
* depth: How many levels of merging deep this node has been
479
* revno_sequence: This field provides a sequence of
480
revision numbers for all revisions. The format is:
481
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
482
branch that the revno is on. From left to right the REVNO numbers
483
are the sequence numbers within that branch of the revision.
484
* end_of_merge: When True the next node (earlier in history) is
485
part of a different merge.
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:
515
rev_id = node.key[-1]
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 = chain(iter([node]), rev_iter)
524
if stop_revision_id is None:
526
for node in rev_iter:
527
rev_id = node.key[-1]
528
yield (rev_id, node.merge_depth, node.revno,
530
elif stop_rule == 'exclude':
531
for node in rev_iter:
532
rev_id = node.key[-1]
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:
539
rev_id = node.key[-1]
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:
551
rev_id = node.key[-1]
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:
567
rev_id = node.key[-1]
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 = rev_iter.next()
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()
194
645
def bind(self, other):
195
646
"""Bind the local branch the other branch.
278
728
The delta is relative to its mainline predecessor, or the
279
729
empty tree for revision 1.
281
assert isinstance(revno, int)
282
731
rh = self.revision_history()
283
732
if not (1 <= revno <= len(rh)):
284
raise InvalidRevisionNumber(revno)
733
raise errors.InvalidRevisionNumber(revno)
285
734
return self.repository.get_revision_delta(rh[revno-1])
287
def get_root_id(self):
288
"""Return the id of this branches root"""
289
raise NotImplementedError(self.get_root_id)
736
def get_stacked_on_url(self):
737
"""Get the URL this branch is stacked against.
739
:raises NotStacked: If the branch is not stacked.
740
:raises UnstackableBranchFormat: If the branch does not support
743
raise NotImplementedError(self.get_stacked_on_url)
291
745
def print_file(self, file, revision_id):
292
746
"""Print `file` to stdout."""
293
747
raise NotImplementedError(self.print_file)
295
def append_revision(self, *revision_ids):
296
raise NotImplementedError(self.append_revision)
298
749
def set_revision_history(self, rev_history):
299
750
raise NotImplementedError(self.set_revision_history)
753
def set_parent(self, url):
754
"""See Branch.set_parent."""
755
# TODO: Maybe delete old location files?
756
# URLs should never be unicode, even on the local fs,
757
# FIXUP this and get_parent in a future branch format bump:
758
# read and rewrite the file. RBC 20060125
760
if isinstance(url, unicode):
762
url = url.encode('ascii')
763
except UnicodeEncodeError:
764
raise errors.InvalidURL(url,
765
"Urls must be 7-bit ascii, "
766
"use bzrlib.urlutils.escape")
767
url = urlutils.relative_url(self.base, url)
768
self._set_parent_location(url)
771
def set_stacked_on_url(self, url):
772
"""Set the URL this branch is stacked against.
774
:raises UnstackableBranchFormat: If the branch does not support
776
:raises UnstackableRepositoryFormat: If the repository does not support
779
if not self._format.supports_stacking():
780
raise errors.UnstackableBranchFormat(self._format, self.user_url)
781
# XXX: Changing from one fallback repository to another does not check
782
# that all the data you need is present in the new fallback.
783
# Possibly it should.
784
self._check_stackable_repo()
787
old_url = self.get_stacked_on_url()
788
except (errors.NotStacked, errors.UnstackableBranchFormat,
789
errors.UnstackableRepositoryFormat):
793
self._activate_fallback_location(url)
794
# write this out after the repository is stacked to avoid setting a
795
# stacked config that doesn't work.
796
self._set_config_location('stacked_on_location', url)
799
"""Change a branch to be unstacked, copying data as needed.
801
Don't call this directly, use set_stacked_on_url(None).
803
pb = ui.ui_factory.nested_progress_bar()
805
pb.update("Unstacking")
806
# The basic approach here is to fetch the tip of the branch,
807
# including all available ghosts, from the existing stacked
808
# repository into a new repository object without the fallbacks.
810
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
811
# correct for CHKMap repostiories
812
old_repository = self.repository
813
if len(old_repository._fallback_repositories) != 1:
814
raise AssertionError("can't cope with fallback repositories "
815
"of %r (fallbacks: %r)" % (old_repository,
816
old_repository._fallback_repositories))
817
# Open the new repository object.
818
# Repositories don't offer an interface to remove fallback
819
# repositories today; take the conceptually simpler option and just
820
# reopen it. We reopen it starting from the URL so that we
821
# get a separate connection for RemoteRepositories and can
822
# stream from one of them to the other. This does mean doing
823
# separate SSH connection setup, but unstacking is not a
824
# common operation so it's tolerable.
825
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
826
new_repository = new_bzrdir.find_repository()
827
if new_repository._fallback_repositories:
828
raise AssertionError("didn't expect %r to have "
829
"fallback_repositories"
830
% (self.repository,))
831
# Replace self.repository with the new repository.
832
# Do our best to transfer the lock state (i.e. lock-tokens and
833
# lock count) of self.repository to the new repository.
834
lock_token = old_repository.lock_write().repository_token
835
self.repository = new_repository
836
if isinstance(self, remote.RemoteBranch):
837
# Remote branches can have a second reference to the old
838
# repository that need to be replaced.
839
if self._real_branch is not None:
840
self._real_branch.repository = new_repository
841
self.repository.lock_write(token=lock_token)
842
if lock_token is not None:
843
old_repository.leave_lock_in_place()
844
old_repository.unlock()
845
if lock_token is not None:
846
# XXX: self.repository.leave_lock_in_place() before this
847
# function will not be preserved. Fortunately that doesn't
848
# affect the current default format (2a), and would be a
849
# corner-case anyway.
850
# - Andrew Bennetts, 2010/06/30
851
self.repository.dont_leave_lock_in_place()
855
old_repository.unlock()
856
except errors.LockNotHeld:
859
if old_lock_count == 0:
860
raise AssertionError(
861
'old_repository should have been locked at least once.')
862
for i in range(old_lock_count-1):
863
self.repository.lock_write()
864
# Fetch from the old repository into the new.
865
old_repository.lock_read()
867
# XXX: If you unstack a branch while it has a working tree
868
# with a pending merge, the pending-merged revisions will no
869
# longer be present. You can (probably) revert and remerge.
871
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
872
except errors.TagsNotSupported:
873
tags_to_fetch = set()
874
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
875
old_repository, required_ids=[self.last_revision()],
876
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
877
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
879
old_repository.unlock()
883
def _set_tags_bytes(self, bytes):
884
"""Mirror method for _get_tags_bytes.
886
:seealso: Branch._get_tags_bytes.
888
return _run_with_write_locked_target(self, self._set_tags_bytes_locked,
891
def _set_tags_bytes_locked(self, bytes):
892
self._tags_bytes = bytes
893
return self._transport.put_bytes('tags', bytes)
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 only for use by subclasses, all other code
921
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 = {}
930
self._tags_bytes = None
932
def _gen_revision_history(self):
933
"""Return sequence of revision hashes on to this branch.
935
Unlike revision_history, this method always regenerates or rereads the
936
revision history, i.e. it does not cache the result, so repeated calls
939
Concrete subclasses should override this instead of revision_history so
940
that subclasses do not need to deal with caching logic.
942
This API is semi-public; it only for use by subclasses, all other code
943
should consider it to be private.
945
raise NotImplementedError(self._gen_revision_history)
301
948
def revision_history(self):
302
"""Return sequence of revision hashes on to this branch."""
303
raise NotImplementedError(self.revision_history)
949
"""Return sequence of revision ids on this branch.
951
This method will cache the revision history for as long as it is safe to
954
if 'evil' in debug.debug_flags:
955
mutter_callsite(3, "revision_history scales with history.")
956
if self._revision_history_cache is not None:
957
history = self._revision_history_cache
959
history = self._gen_revision_history()
960
self._cache_revision_history(history)
306
964
"""Return current revision number for this branch.
308
966
That is equivalent to the number of revisions committed to
311
return len(self.revision_history())
969
return self.last_revision_info()[0]
313
971
def unbind(self):
314
972
"""Older format branches cannot bind or unbind."""
315
raise errors.UpgradeRequired(self.base)
973
raise errors.UpgradeRequired(self.user_url)
317
975
def last_revision(self):
318
"""Return last revision id, or None"""
319
ph = self.revision_history()
325
def missing_revisions(self, other, stop_revision=None):
326
"""Return a list of new revisions that would perfectly fit.
328
If self and other have not diverged, return a list of the revisions
329
present in other, but missing from self.
976
"""Return last revision id, or NULL_REVISION."""
977
return self.last_revision_info()[1]
980
def last_revision_info(self):
981
"""Return information about the last revision.
983
:return: A tuple (revno, revision_id).
331
self_history = self.revision_history()
332
self_len = len(self_history)
333
other_history = other.revision_history()
334
other_len = len(other_history)
335
common_index = min(self_len, other_len) -1
336
if common_index >= 0 and \
337
self_history[common_index] != other_history[common_index]:
338
raise DivergedBranches(self, other)
985
if self._last_revision_info_cache is None:
986
self._last_revision_info_cache = self._last_revision_info()
987
return self._last_revision_info_cache
340
if stop_revision is None:
341
stop_revision = other_len
989
def _last_revision_info(self):
990
rh = self.revision_history()
993
return (revno, rh[-1])
343
assert isinstance(stop_revision, int)
344
if stop_revision > other_len:
345
raise errors.NoSuchRevision(self, stop_revision)
346
return other_history[self_len:stop_revision]
995
return (0, _mod_revision.NULL_REVISION)
348
def update_revisions(self, other, stop_revision=None):
997
def update_revisions(self, other, stop_revision=None, overwrite=False,
349
999
"""Pull in new perfect-fit revisions.
351
1001
:param other: Another Branch to pull from
352
1002
:param stop_revision: Updated until the given revision
1003
:param overwrite: Always set the branch pointer, rather than checking
1004
to see if it is a proper descendant.
1005
:param graph: A Graph object that can be used to query history
1006
information. This can be None.
355
raise NotImplementedError(self.update_revisions)
1009
return InterBranch.get(other, self).update_revisions(stop_revision,
1012
@deprecated_method(deprecated_in((2, 4, 0)))
1013
def import_last_revision_info(self, source_repo, revno, revid):
1014
"""Set the last revision info, importing from another repo if necessary.
1016
:param source_repo: Source repository to optionally fetch from
1017
:param revno: Revision number of the new tip
1018
:param revid: Revision id of the new tip
1020
if not self.repository.has_same_location(source_repo):
1021
self.repository.fetch(source_repo, revision_id=revid)
1022
self.set_last_revision_info(revno, revid)
1024
def import_last_revision_info_and_tags(self, source, revno, revid,
1026
"""Set the last revision info, importing from another repo if necessary.
1028
This is used by the bound branch code to upload a revision to
1029
the master branch first before updating the tip of the local branch.
1030
Revisions referenced by source's tags are also transferred.
1032
:param source: Source branch to optionally fetch from
1033
:param revno: Revision number of the new tip
1034
:param revid: Revision id of the new tip
1035
:param lossy: Whether to discard metadata that can not be
1036
natively represented
1037
:return: Tuple with the new revision number and revision id
1038
(should only be different from the arguments when lossy=True)
1040
if not self.repository.has_same_location(source.repository):
1041
self.fetch(source, revid)
1042
self.set_last_revision_info(revno, revid)
1043
return (revno, revid)
357
1045
def revision_id_to_revno(self, revision_id):
358
1046
"""Given a revision id, return its revno"""
359
if revision_id is None:
1047
if _mod_revision.is_null(revision_id):
361
1049
history = self.revision_history()
363
1051
return history.index(revision_id) + 1
364
1052
except ValueError:
365
raise bzrlib.errors.NoSuchRevision(self, revision_id)
1053
raise errors.NoSuchRevision(self, revision_id)
367
1056
def get_rev_id(self, revno, history=None):
368
1057
"""Find the revision id of the specified revno."""
372
history = self.revision_history()
373
if revno <= 0 or revno > len(history):
374
raise bzrlib.errors.NoSuchRevision(self, revno)
375
return history[revno - 1]
377
def pull(self, source, overwrite=False, stop_revision=None):
378
raise NotImplementedError(self.pull)
1059
return _mod_revision.NULL_REVISION
1060
last_revno, last_revid = self.last_revision_info()
1061
if revno == last_revno:
1063
if revno <= 0 or revno > last_revno:
1064
raise errors.NoSuchRevision(self, revno)
1065
distance_from_last = last_revno - revno
1066
if len(self._partial_revision_history_cache) <= distance_from_last:
1067
self._extend_partial_history(distance_from_last)
1068
return self._partial_revision_history_cache[distance_from_last]
1070
def pull(self, source, overwrite=False, stop_revision=None,
1071
possible_transports=None, *args, **kwargs):
1072
"""Mirror source into this branch.
1074
This branch is considered to be 'local', having low latency.
1076
:returns: PullResult instance
1078
return InterBranch.get(source, self).pull(overwrite=overwrite,
1079
stop_revision=stop_revision,
1080
possible_transports=possible_transports, *args, **kwargs)
1082
def push(self, target, overwrite=False, stop_revision=None, *args,
1084
"""Mirror this branch into target.
1086
This branch is considered to be 'local', having low latency.
1088
return InterBranch.get(self, target).push(overwrite, stop_revision,
1091
def lossy_push(self, target, stop_revision=None):
1092
"""Push deltas into another branch.
1094
:note: This does not, like push, retain the revision ids from
1095
the source branch and will, rather than adding bzr-specific
1096
metadata, push only those semantics of the revision that can be
1097
natively represented by this branch' VCS.
1099
:param target: Target branch
1100
:param stop_revision: Revision to push, defaults to last revision.
1101
:return: BranchPushResult with an extra member revidmap:
1102
A dictionary mapping revision ids from the target branch
1103
to new revision ids in the target branch, for each
1104
revision that was pushed.
1106
inter = InterBranch.get(self, target)
1107
lossy_push = getattr(inter, "lossy_push", None)
1108
if lossy_push is None:
1109
raise errors.LossyPushToSameVCS(self, target)
1110
return lossy_push(stop_revision)
380
1112
def basis_tree(self):
381
1113
"""Return `Tree` object for last revision."""
382
1114
return self.repository.revision_tree(self.last_revision())
384
def rename_one(self, from_rel, to_rel):
387
This can change the directory or the filename or both.
389
raise NotImplementedError(self.rename_one)
391
def move(self, from_paths, to_name):
394
to_name must exist as a versioned directory.
396
If to_name exists and is a directory, the files are moved into
397
it, keeping their old names. If it is a directory,
399
Note that to_name is only the last component of the new name;
400
this doesn't change the directory.
402
This returns a list of (from_path, to_path) pairs for each
405
raise NotImplementedError(self.move)
407
1116
def get_parent(self):
408
1117
"""Return the parent location of the branch.
410
This is the default location for push/pull/missing. The usual
1119
This is the default location for pull/missing. The usual
411
1120
pattern is that the user can override it by specifying a
414
raise NotImplementedError(self.get_parent)
1123
parent = self._get_parent_location()
1126
# This is an old-format absolute path to a local branch
1127
# turn it into a url
1128
if parent.startswith('/'):
1129
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1131
return urlutils.join(self.base[:-1], parent)
1132
except errors.InvalidURLJoin, e:
1133
raise errors.InaccessibleParent(parent, self.user_url)
1135
def _get_parent_location(self):
1136
raise NotImplementedError(self._get_parent_location)
1138
def _set_config_location(self, name, url, config=None,
1139
make_relative=False):
1141
config = self.get_config()
1145
url = urlutils.relative_url(self.base, url)
1146
config.set_user_option(name, url, warn_masked=True)
1148
def _get_config_location(self, name, config=None):
1150
config = self.get_config()
1151
location = config.get_user_option(name)
1156
def get_child_submit_format(self):
1157
"""Return the preferred format of submissions to this branch."""
1158
return self.get_config().get_user_option("child_submit_format")
416
1160
def get_submit_branch(self):
417
1161
"""Return the submit location of the branch.
459
1240
self.check_real_revno(revno)
461
1242
def check_real_revno(self, revno):
463
1244
Check whether a revno corresponds to a real revision.
464
1245
Zero (the NULL revision) is considered invalid
466
1247
if revno < 1 or revno > self.revno():
467
raise InvalidRevisionNumber(revno)
1248
raise errors.InvalidRevisionNumber(revno)
469
1250
@needs_read_lock
470
def clone(self, *args, **kwargs):
1251
def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
471
1252
"""Clone this branch into to_bzrdir preserving all semantic values.
1254
Most API users will want 'create_clone_on_transport', which creates a
1255
new bzrdir and branch on the fly.
473
1257
revision_id: if not None, the revision history in the new branch will
474
1258
be truncated to end with revision_id.
476
# for API compatibility, until 0.8 releases we provide the old api:
477
# def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
478
# after 0.8 releases, the *args and **kwargs should be changed:
479
# def clone(self, to_bzrdir, revision_id=None):
480
if (kwargs.get('to_location', None) or
481
kwargs.get('revision', None) or
482
kwargs.get('basis_branch', None) or
483
(len(args) and isinstance(args[0], basestring))):
484
# backwards compatibility api:
485
warn("Branch.clone() has been deprecated for BzrDir.clone() from"
486
" bzrlib 0.8.", DeprecationWarning, stacklevel=3)
489
basis_branch = args[2]
491
basis_branch = kwargs.get('basis_branch', None)
493
basis = basis_branch.bzrdir
498
revision_id = args[1]
500
revision_id = kwargs.get('revision', None)
505
# no default to raise if not provided.
506
url = kwargs.get('to_location')
507
return self.bzrdir.clone(url,
508
revision_id=revision_id,
509
basis=basis).open_branch()
511
# generate args by hand
513
revision_id = args[1]
515
revision_id = kwargs.get('revision_id', None)
519
# no default to raise if not provided.
520
to_bzrdir = kwargs.get('to_bzrdir')
521
result = self._format.initialize(to_bzrdir)
522
self.copy_content_into(result, revision_id=revision_id)
1260
result = to_bzrdir.create_branch()
1263
if repository_policy is not None:
1264
repository_policy.configure_branch(result)
1265
self.copy_content_into(result, revision_id=revision_id)
525
1270
@needs_read_lock
526
def sprout(self, to_bzrdir, revision_id=None):
1271
def sprout(self, to_bzrdir, revision_id=None, repository_policy=None,
527
1273
"""Create a new line of development from the branch, into to_bzrdir.
1275
to_bzrdir controls the branch format.
529
1277
revision_id: if not None, the revision history in the new branch will
530
1278
be truncated to end with revision_id.
532
result = self._format.initialize(to_bzrdir)
533
self.copy_content_into(result, revision_id=revision_id)
534
result.set_parent(self.bzrdir.root_transport.base)
1280
if (repository_policy is not None and
1281
repository_policy.requires_stacking()):
1282
to_bzrdir._format.require_stacking(_skip_repo=True)
1283
result = to_bzrdir.create_branch(repository=repository)
1286
if repository_policy is not None:
1287
repository_policy.configure_branch(result)
1288
self.copy_content_into(result, revision_id=revision_id)
1289
result.set_parent(self.bzrdir.root_transport.base)
1294
def _synchronize_history(self, destination, revision_id):
1295
"""Synchronize last revision and revision history between branches.
1297
This version is most efficient when the destination is also a
1298
BzrBranch6, but works for BzrBranch5, as long as the destination's
1299
repository contains all the lefthand ancestors of the intended
1300
last_revision. If not, set_last_revision_info will fail.
1302
:param destination: The branch to copy the history into
1303
:param revision_id: The revision-id to truncate history at. May
1304
be None to copy complete history.
1306
source_revno, source_revision_id = self.last_revision_info()
1307
if revision_id is None:
1308
revno, revision_id = source_revno, source_revision_id
1310
graph = self.repository.get_graph()
1312
revno = graph.find_distance_to_null(revision_id,
1313
[(source_revision_id, source_revno)])
1314
except errors.GhostRevisionsHaveNoRevno:
1315
# Default to 1, if we can't find anything else
1317
destination.set_last_revision_info(revno, revision_id)
538
1319
def copy_content_into(self, destination, revision_id=None):
539
1320
"""Copy the content of self into destination.
541
1322
revision_id: if not None, the revision history in the new branch will
542
1323
be truncated to end with revision_id.
544
new_history = self.revision_history()
545
if revision_id is not None:
547
new_history = new_history[:new_history.index(revision_id) + 1]
549
rev = self.repository.get_revision(revision_id)
550
new_history = rev.get_history(self.repository)[1:]
551
destination.set_revision_history(new_history)
553
parent = self.get_parent()
554
except errors.InaccessibleParent, e:
555
mutter('parent was not accessible to copy: %s', e)
558
destination.set_parent(parent)
1325
return InterBranch.get(self, destination).copy_content_into(
1326
revision_id=revision_id)
1328
def update_references(self, target):
1329
if not getattr(self._format, 'supports_reference_locations', False):
1331
reference_dict = self._get_all_reference_info()
1332
if len(reference_dict) == 0:
1334
old_base = self.base
1335
new_base = target.base
1336
target_reference_dict = target._get_all_reference_info()
1337
for file_id, (tree_path, branch_location) in (
1338
reference_dict.items()):
1339
branch_location = urlutils.rebase_url(branch_location,
1341
target_reference_dict.setdefault(
1342
file_id, (tree_path, branch_location))
1343
target._set_all_reference_info(target_reference_dict)
560
1345
@needs_read_lock
1346
def check(self, refs):
562
1347
"""Check consistency of the branch.
564
1349
In particular this checks that revisions given in the revision-history
565
do actually match up in the revision graph, and that they're all
1350
do actually match up in the revision graph, and that they're all
566
1351
present in the repository.
568
1353
Callers will typically also want to check the repository.
1355
:param refs: Calculated refs for this branch as specified by
1356
branch._get_check_refs()
570
1357
:return: A BranchCheckResult.
572
mainline_parent_id = None
573
for revision_id in self.revision_history():
575
revision = self.repository.get_revision(revision_id)
576
except errors.NoSuchRevision, e:
577
raise errors.BzrCheckError("mainline revision {%s} not in repository"
579
# In general the first entry on the revision history has no parents.
580
# But it's not illegal for it to have parents listed; this can happen
581
# in imports from Arch when the parents weren't reachable.
582
if mainline_parent_id is not None:
583
if mainline_parent_id not in revision.parent_ids:
584
raise errors.BzrCheckError("previous revision {%s} not listed among "
586
% (mainline_parent_id, revision_id))
587
mainline_parent_id = revision_id
588
return BranchCheckResult(self)
1359
result = BranchCheckResult(self)
1360
last_revno, last_revision_id = self.last_revision_info()
1361
actual_revno = refs[('lefthand-distance', last_revision_id)]
1362
if actual_revno != last_revno:
1363
result.errors.append(errors.BzrCheckError(
1364
'revno does not match len(mainline) %s != %s' % (
1365
last_revno, actual_revno)))
1366
# TODO: We should probably also check that self.revision_history
1367
# matches the repository for older branch formats.
1368
# If looking for the code that cross-checks repository parents against
1369
# the iter_reverse_revision_history output, that is now a repository
590
1373
def _get_checkout_format(self):
591
1374
"""Return the most suitable metadir for a checkout of this branch.
592
Weaves are used if this branch's repostory uses weaves.
1375
Weaves are used if this branch's repository uses weaves.
594
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
595
from bzrlib import repository
596
format = bzrdir.BzrDirMetaFormat1()
597
format.repository_format = repository.RepositoryFormat7()
599
format = self.repository.bzrdir.cloning_metadir()
1377
format = self.repository.bzrdir.checkout_metadir()
1378
format.set_branch_format(self._format)
602
def create_checkout(self, to_location, revision_id=None,
1381
def create_clone_on_transport(self, to_transport, revision_id=None,
1382
stacked_on=None, create_prefix=False, use_existing_dir=False,
1384
"""Create a clone of this branch and its bzrdir.
1386
:param to_transport: The transport to clone onto.
1387
:param revision_id: The revision id to use as tip in the new branch.
1388
If None the tip is obtained from this branch.
1389
:param stacked_on: An optional URL to stack the clone on.
1390
:param create_prefix: Create any missing directories leading up to
1392
:param use_existing_dir: Use an existing directory if one exists.
1394
# XXX: Fix the bzrdir API to allow getting the branch back from the
1395
# clone call. Or something. 20090224 RBC/spiv.
1396
# XXX: Should this perhaps clone colocated branches as well,
1397
# rather than just the default branch? 20100319 JRV
1398
if revision_id is None:
1399
revision_id = self.last_revision()
1400
dir_to = self.bzrdir.clone_on_transport(to_transport,
1401
revision_id=revision_id, stacked_on=stacked_on,
1402
create_prefix=create_prefix, use_existing_dir=use_existing_dir,
1404
return dir_to.open_branch()
1406
def create_checkout(self, to_location, revision_id=None,
1407
lightweight=False, accelerator_tree=None,
604
1409
"""Create a checkout of a branch.
606
1411
:param to_location: The url to produce the checkout at
607
1412
:param revision_id: The revision to check out
608
1413
:param lightweight: If True, produce a lightweight checkout, otherwise,
609
1414
produce a bound branch (heavyweight checkout)
1415
:param accelerator_tree: A tree which can be used for retrieving file
1416
contents more quickly than the revision tree, i.e. a workingtree.
1417
The revision tree will be used for cases where accelerator_tree's
1418
content is different.
1419
:param hardlink: If true, hard-link files from accelerator_tree,
610
1421
:return: The tree of the created checkout
612
1423
t = transport.get_transport(to_location)
615
except errors.FileExists:
618
checkout = bzrdir.BzrDirMetaFormat1().initialize_on_transport(t)
619
BranchReferenceFormat().initialize(checkout, self)
1426
format = self._get_checkout_format()
1427
checkout = format.initialize_on_transport(t)
1428
from_branch = BranchReferenceFormat().initialize(checkout,
621
1431
format = self._get_checkout_format()
622
1432
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
623
1433
to_location, force_new_tree=False, format=format)
624
1434
checkout = checkout_branch.bzrdir
625
1435
checkout_branch.bind(self)
626
# pull up to the specified revision_id to set the initial
1436
# pull up to the specified revision_id to set the initial
627
1437
# branch tip correctly, and seed it with history.
628
1438
checkout_branch.pull(self, stop_revision=revision_id)
629
return checkout.create_workingtree(revision_id)
632
class BranchFormat(object):
1440
tree = checkout.create_workingtree(revision_id,
1441
from_branch=from_branch,
1442
accelerator_tree=accelerator_tree,
1444
basis_tree = tree.basis_tree()
1445
basis_tree.lock_read()
1447
for path, file_id in basis_tree.iter_references():
1448
reference_parent = self.reference_parent(file_id, path)
1449
reference_parent.create_checkout(tree.abspath(path),
1450
basis_tree.get_reference_revision(file_id, path),
1457
def reconcile(self, thorough=True):
1458
"""Make sure the data stored in this branch is consistent."""
1459
from bzrlib.reconcile import BranchReconciler
1460
reconciler = BranchReconciler(self, thorough=thorough)
1461
reconciler.reconcile()
1464
def reference_parent(self, file_id, path, possible_transports=None):
1465
"""Return the parent branch for a tree-reference file_id
1466
:param file_id: The file_id of the tree reference
1467
:param path: The path of the file_id in the tree
1468
:return: A branch associated with the file_id
1470
# FIXME should provide multiple branches, based on config
1471
return Branch.open(self.bzrdir.root_transport.clone(path).base,
1472
possible_transports=possible_transports)
1474
def supports_tags(self):
1475
return self._format.supports_tags()
1477
def automatic_tag_name(self, revision_id):
1478
"""Try to automatically find the tag name for a revision.
1480
:param revision_id: Revision id of the revision.
1481
:return: A tag name or None if no tag name could be determined.
1483
for hook in Branch.hooks['automatic_tag_name']:
1484
ret = hook(self, revision_id)
1489
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1491
"""Ensure that revision_b is a descendant of revision_a.
1493
This is a helper function for update_revisions.
1495
:raises: DivergedBranches if revision_b has diverged from revision_a.
1496
:returns: True if revision_b is a descendant of revision_a.
1498
relation = self._revision_relations(revision_a, revision_b, graph)
1499
if relation == 'b_descends_from_a':
1501
elif relation == 'diverged':
1502
raise errors.DivergedBranches(self, other_branch)
1503
elif relation == 'a_descends_from_b':
1506
raise AssertionError("invalid relation: %r" % (relation,))
1508
def _revision_relations(self, revision_a, revision_b, graph):
1509
"""Determine the relationship between two revisions.
1511
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1513
heads = graph.heads([revision_a, revision_b])
1514
if heads == set([revision_b]):
1515
return 'b_descends_from_a'
1516
elif heads == set([revision_a, revision_b]):
1517
# These branches have diverged
1519
elif heads == set([revision_a]):
1520
return 'a_descends_from_b'
1522
raise AssertionError("invalid heads: %r" % (heads,))
1524
def heads_to_fetch(self):
1525
"""Return the heads that must and that should be fetched to copy this
1526
branch into another repo.
1528
:returns: a 2-tuple of (must_fetch, if_present_fetch). must_fetch is a
1529
set of heads that must be fetched. if_present_fetch is a set of
1530
heads that must be fetched if present, but no error is necessary if
1531
they are not present.
1533
# For bzr native formats must_fetch is just the tip, and if_present_fetch
1535
must_fetch = set([self.last_revision()])
1537
if_present_fetch = set(self.tags.get_reverse_tag_dict())
1538
except errors.TagsNotSupported:
1539
if_present_fetch = set()
1540
must_fetch.discard(_mod_revision.NULL_REVISION)
1541
if_present_fetch.discard(_mod_revision.NULL_REVISION)
1542
return must_fetch, if_present_fetch
1545
class BranchFormat(controldir.ControlComponentFormat):
633
1546
"""An encapsulation of the initialization and open routines for a format.
635
1548
Formats provide three things:
677
1630
def get_format_description(self):
678
1631
"""Return the short format description for this format."""
679
raise NotImplementedError(self.get_format_string)
681
def initialize(self, a_bzrdir):
682
"""Create a branch of this format in a_bzrdir."""
1632
raise NotImplementedError(self.get_format_description)
1634
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1635
hooks = Branch.hooks['post_branch_init']
1638
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1642
def initialize(self, a_bzrdir, name=None, repository=None):
1643
"""Create a branch of this format in a_bzrdir.
1645
:param name: Name of the colocated branch to create.
683
1647
raise NotImplementedError(self.initialize)
685
1649
def is_supported(self):
686
1650
"""Is this format supported?
688
1652
Supported formats can be initialized and opened.
689
Unsupported formats may not support initialization or committing or
1653
Unsupported formats may not support initialization or committing or
690
1654
some other features depending on the reason for not being supported.
694
def open(self, a_bzrdir, _found=False):
1658
def make_tags(self, branch):
1659
"""Create a tags object for branch.
1661
This method is on BranchFormat, because BranchFormats are reflected
1662
over the wire via network_name(), whereas full Branch instances require
1663
multiple VFS method calls to operate at all.
1665
The default implementation returns a disabled-tags instance.
1667
Note that it is normal for branch to be a RemoteBranch when using tags
1670
return DisabledTags(branch)
1672
def network_name(self):
1673
"""A simple byte string uniquely identifying this format for RPC calls.
1675
MetaDir branch formats use their disk format string to identify the
1676
repository over the wire. All in one formats such as bzr < 0.8, and
1677
foreign formats like svn/git and hg should use some marker which is
1678
unique and immutable.
1680
raise NotImplementedError(self.network_name)
1682
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
1683
found_repository=None):
695
1684
"""Return the branch object for a_bzrdir
697
_found is a private parameter, do not use it. It is used to indicate
698
if format probing has already be done.
1686
:param a_bzrdir: A BzrDir that contains a branch.
1687
:param name: Name of colocated branch to open
1688
:param _found: a private parameter, do not use it. It is used to
1689
indicate if format probing has already be done.
1690
:param ignore_fallbacks: when set, no fallback branches will be opened
1691
(if there are any). Default is to open fallbacks.
700
1693
raise NotImplementedError(self.open)
1696
@deprecated_method(deprecated_in((2, 4, 0)))
703
1697
def register_format(klass, format):
704
klass._formats[format.get_format_string()] = format
1698
"""Register a metadir format.
1700
See MetaDirBranchFormatFactory for the ability to register a format
1701
without loading the code the format needs until it is actually used.
1703
format_registry.register(format)
1706
@deprecated_method(deprecated_in((2, 4, 0)))
707
1707
def set_default_format(klass, format):
708
klass._default_format = format
1708
format_registry.set_default(format)
1710
def supports_set_append_revisions_only(self):
1711
"""True if this format supports set_append_revisions_only."""
1714
def supports_stacking(self):
1715
"""True if this format records a stacked-on branch."""
1718
def supports_leaving_lock(self):
1719
"""True if this format supports leaving locks in place."""
1720
return False # by default
1723
@deprecated_method(deprecated_in((2, 4, 0)))
711
1724
def unregister_format(klass, format):
712
assert klass._formats[format.get_format_string()] is format
713
del klass._formats[format.get_format_string()]
1725
format_registry.remove(format)
715
1727
def __str__(self):
716
return self.get_format_string().rstrip()
719
class BzrBranchFormat4(BranchFormat):
720
"""Bzr branch format 4.
723
- a revision-history file.
724
- a branch-lock lock file [ to be shared with the bzrdir ]
727
def get_format_description(self):
728
"""See BranchFormat.get_format_description()."""
729
return "Branch format 4"
731
def initialize(self, a_bzrdir):
732
"""Create a branch of this format in a_bzrdir."""
733
mutter('creating branch in %s', a_bzrdir.transport.base)
734
branch_transport = a_bzrdir.get_branch_transport(self)
735
utf8_files = [('revision-history', ''),
1728
return self.get_format_description().rstrip()
1730
def supports_tags(self):
1731
"""True if this format supports tags stored in the branch"""
1732
return False # by default
1735
class MetaDirBranchFormatFactory(registry._LazyObjectGetter):
1736
"""A factory for a BranchFormat object, permitting simple lazy registration.
1738
While none of the built in BranchFormats are lazy registered yet,
1739
bzrlib.tests.test_branch.TestMetaDirBranchFormatFactory demonstrates how to
1740
use it, and the bzr-loom plugin uses it as well (see
1741
bzrlib.plugins.loom.formats).
1744
def __init__(self, format_string, module_name, member_name):
1745
"""Create a MetaDirBranchFormatFactory.
1747
:param format_string: The format string the format has.
1748
:param module_name: Module to load the format class from.
1749
:param member_name: Attribute name within the module for the format class.
1751
registry._LazyObjectGetter.__init__(self, module_name, member_name)
1752
self._format_string = format_string
1754
def get_format_string(self):
1755
"""See BranchFormat.get_format_string."""
1756
return self._format_string
1759
"""Used for network_format_registry support."""
1760
return self.get_obj()()
1763
class BranchHooks(Hooks):
1764
"""A dictionary mapping hook name to a list of callables for branch hooks.
1766
e.g. ['set_rh'] Is the list of items to be called when the
1767
set_revision_history function is invoked.
1771
"""Create the default hooks.
1773
These are all empty initially, because by default nothing should get
1776
Hooks.__init__(self, "bzrlib.branch", "Branch.hooks")
1777
self.add_hook('set_rh',
1778
"Invoked whenever the revision history has been set via "
1779
"set_revision_history. The api signature is (branch, "
1780
"revision_history), and the branch will be write-locked. "
1781
"The set_rh hook can be expensive for bzr to trigger, a better "
1782
"hook to use is Branch.post_change_branch_tip.", (0, 15))
1783
self.add_hook('open',
1784
"Called with the Branch object that has been opened after a "
1785
"branch is opened.", (1, 8))
1786
self.add_hook('post_push',
1787
"Called after a push operation completes. post_push is called "
1788
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1789
"bzr client.", (0, 15))
1790
self.add_hook('post_pull',
1791
"Called after a pull operation completes. post_pull is called "
1792
"with a bzrlib.branch.PullResult object and only runs in the "
1793
"bzr client.", (0, 15))
1794
self.add_hook('pre_commit',
1795
"Called after a commit is calculated but before it is "
1796
"completed. pre_commit is called with (local, master, old_revno, "
1797
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1798
"). old_revid is NULL_REVISION for the first commit to a branch, "
1799
"tree_delta is a TreeDelta object describing changes from the "
1800
"basis revision. hooks MUST NOT modify this delta. "
1801
" future_tree is an in-memory tree obtained from "
1802
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1804
self.add_hook('post_commit',
1805
"Called in the bzr client after a commit has completed. "
1806
"post_commit is called with (local, master, old_revno, old_revid, "
1807
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1808
"commit to a branch.", (0, 15))
1809
self.add_hook('post_uncommit',
1810
"Called in the bzr client after an uncommit completes. "
1811
"post_uncommit is called with (local, master, old_revno, "
1812
"old_revid, new_revno, new_revid) where local is the local branch "
1813
"or None, master is the target branch, and an empty branch "
1814
"receives new_revno of 0, new_revid of None.", (0, 15))
1815
self.add_hook('pre_change_branch_tip',
1816
"Called in bzr client and server before a change to the tip of a "
1817
"branch is made. pre_change_branch_tip is called with a "
1818
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1819
"commit, uncommit will all trigger this hook.", (1, 6))
1820
self.add_hook('post_change_branch_tip',
1821
"Called in bzr client and server after a change to the tip of a "
1822
"branch is made. post_change_branch_tip is called with a "
1823
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1824
"commit, uncommit will all trigger this hook.", (1, 4))
1825
self.add_hook('transform_fallback_location',
1826
"Called when a stacked branch is activating its fallback "
1827
"locations. transform_fallback_location is called with (branch, "
1828
"url), and should return a new url. Returning the same url "
1829
"allows it to be used as-is, returning a different one can be "
1830
"used to cause the branch to stack on a closer copy of that "
1831
"fallback_location. Note that the branch cannot have history "
1832
"accessing methods called on it during this hook because the "
1833
"fallback locations have not been activated. When there are "
1834
"multiple hooks installed for transform_fallback_location, "
1835
"all are called with the url returned from the previous hook."
1836
"The order is however undefined.", (1, 9))
1837
self.add_hook('automatic_tag_name',
1838
"Called to determine an automatic tag name for a revision. "
1839
"automatic_tag_name is called with (branch, revision_id) and "
1840
"should return a tag name or None if no tag name could be "
1841
"determined. The first non-None tag name returned will be used.",
1843
self.add_hook('post_branch_init',
1844
"Called after new branch initialization completes. "
1845
"post_branch_init is called with a "
1846
"bzrlib.branch.BranchInitHookParams. "
1847
"Note that init, branch and checkout (both heavyweight and "
1848
"lightweight) will all trigger this hook.", (2, 2))
1849
self.add_hook('post_switch',
1850
"Called after a checkout switches branch. "
1851
"post_switch is called with a "
1852
"bzrlib.branch.SwitchHookParams.", (2, 2))
1856
# install the default hooks into the Branch class.
1857
Branch.hooks = BranchHooks()
1860
class ChangeBranchTipParams(object):
1861
"""Object holding parameters passed to *_change_branch_tip hooks.
1863
There are 5 fields that hooks may wish to access:
1865
:ivar branch: the branch being changed
1866
:ivar old_revno: revision number before the change
1867
:ivar new_revno: revision number after the change
1868
:ivar old_revid: revision id before the change
1869
:ivar new_revid: revision id after the change
1871
The revid fields are strings. The revno fields are integers.
1874
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1875
"""Create a group of ChangeBranchTip parameters.
1877
:param branch: The branch being changed.
1878
:param old_revno: Revision number before the change.
1879
:param new_revno: Revision number after the change.
1880
:param old_revid: Tip revision id before the change.
1881
:param new_revid: Tip revision id after the change.
1883
self.branch = branch
1884
self.old_revno = old_revno
1885
self.new_revno = new_revno
1886
self.old_revid = old_revid
1887
self.new_revid = new_revid
1889
def __eq__(self, other):
1890
return self.__dict__ == other.__dict__
1893
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1894
self.__class__.__name__, self.branch,
1895
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1898
class BranchInitHookParams(object):
1899
"""Object holding parameters passed to *_branch_init hooks.
1901
There are 4 fields that hooks may wish to access:
1903
:ivar format: the branch format
1904
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1905
:ivar name: name of colocated branch, if any (or None)
1906
:ivar branch: the branch created
1908
Note that for lightweight checkouts, the bzrdir and format fields refer to
1909
the checkout, hence they are different from the corresponding fields in
1910
branch, which refer to the original branch.
1913
def __init__(self, format, a_bzrdir, name, branch):
1914
"""Create a group of BranchInitHook parameters.
1916
:param format: the branch format
1917
:param a_bzrdir: the BzrDir where the branch will be/has been
1919
:param name: name of colocated branch, if any (or None)
1920
:param branch: the branch created
1922
Note that for lightweight checkouts, the bzrdir and format fields refer
1923
to the checkout, hence they are different from the corresponding fields
1924
in branch, which refer to the original branch.
1926
self.format = format
1927
self.bzrdir = a_bzrdir
1929
self.branch = branch
1931
def __eq__(self, other):
1932
return self.__dict__ == other.__dict__
1935
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1938
class SwitchHookParams(object):
1939
"""Object holding parameters passed to *_switch hooks.
1941
There are 4 fields that hooks may wish to access:
1943
:ivar control_dir: BzrDir of the checkout to change
1944
:ivar to_branch: branch that the checkout is to reference
1945
:ivar force: skip the check for local commits in a heavy checkout
1946
:ivar revision_id: revision ID to switch to (or None)
1949
def __init__(self, control_dir, to_branch, force, revision_id):
1950
"""Create a group of SwitchHook parameters.
1952
:param control_dir: BzrDir of the checkout to change
1953
:param to_branch: branch that the checkout is to reference
1954
:param force: skip the check for local commits in a heavy checkout
1955
:param revision_id: revision ID to switch to (or None)
1957
self.control_dir = control_dir
1958
self.to_branch = to_branch
1960
self.revision_id = revision_id
1962
def __eq__(self, other):
1963
return self.__dict__ == other.__dict__
1966
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1967
self.control_dir, self.to_branch,
1971
class BranchFormatMetadir(BranchFormat):
1972
"""Common logic for meta-dir based branch formats."""
1974
def _branch_class(self):
1975
"""What class to instantiate on open calls."""
1976
raise NotImplementedError(self._branch_class)
1978
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1980
"""Initialize a branch in a bzrdir, with specified files
1982
:param a_bzrdir: The bzrdir to initialize the branch in
1983
:param utf8_files: The files to create as a list of
1984
(filename, content) tuples
1985
:param name: Name of colocated branch to create, if any
1986
:return: a branch in this format
1988
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1989
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
738
1990
control_files = lockable_files.LockableFiles(branch_transport,
739
'branch-lock', lockable_files.TransportLock)
1991
'lock', lockdir.LockDir)
740
1992
control_files.create_lock()
741
1993
control_files.lock_write()
743
for file, content in utf8_files:
744
control_files.put_utf8(file, content)
1995
utf8_files += [('format', self.get_format_string())]
1996
for (filename, content) in utf8_files:
1997
branch_transport.put_bytes(
1999
mode=a_bzrdir._get_file_mode())
746
2001
control_files.unlock()
747
return self.open(a_bzrdir, _found=True)
750
super(BzrBranchFormat4, self).__init__()
751
self._matchingbzrdir = bzrdir.BzrDirFormat6()
753
def open(self, a_bzrdir, _found=False):
754
"""Return the branch object for a_bzrdir
756
_found is a private parameter, do not use it. It is used to indicate
757
if format probing has already be done.
2002
branch = self.open(a_bzrdir, name, _found=True,
2003
found_repository=repository)
2004
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2007
def network_name(self):
2008
"""A simple byte string uniquely identifying this format for RPC calls.
2010
Metadir branch formats use their format string.
2012
return self.get_format_string()
2014
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
2015
found_repository=None):
2016
"""See BranchFormat.open()."""
760
# we are being called directly and must probe.
761
raise NotImplementedError
762
return BzrBranch(_format=self,
763
_control_files=a_bzrdir._control_files,
765
_repository=a_bzrdir.open_repository())
768
return "Bazaar-NG branch format 4"
771
class BzrBranchFormat5(BranchFormat):
2018
format = BranchFormat.find_format(a_bzrdir, name=name)
2019
if format.__class__ != self.__class__:
2020
raise AssertionError("wrong format %r found for %r" %
2022
transport = a_bzrdir.get_branch_transport(None, name=name)
2024
control_files = lockable_files.LockableFiles(transport, 'lock',
2026
if found_repository is None:
2027
found_repository = a_bzrdir.find_repository()
2028
return self._branch_class()(_format=self,
2029
_control_files=control_files,
2032
_repository=found_repository,
2033
ignore_fallbacks=ignore_fallbacks)
2034
except errors.NoSuchFile:
2035
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
2038
super(BranchFormatMetadir, self).__init__()
2039
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2040
self._matchingbzrdir.set_branch_format(self)
2042
def supports_tags(self):
2045
def supports_leaving_lock(self):
2049
class BzrBranchFormat5(BranchFormatMetadir):
772
2050
"""Bzr branch format 5.
774
2052
This format has:
788
2069
def get_format_description(self):
789
2070
"""See BranchFormat.get_format_description()."""
790
2071
return "Branch format 5"
792
def initialize(self, a_bzrdir):
2073
def initialize(self, a_bzrdir, name=None, repository=None):
793
2074
"""Create a branch of this format in a_bzrdir."""
794
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
795
branch_transport = a_bzrdir.get_branch_transport(self)
796
2075
utf8_files = [('revision-history', ''),
797
2076
('branch-name', ''),
799
control_files = lockable_files.LockableFiles(branch_transport, 'lock',
801
control_files.create_lock()
802
control_files.lock_write()
803
control_files.put_utf8('format', self.get_format_string())
805
for file, content in utf8_files:
806
control_files.put_utf8(file, content)
808
control_files.unlock()
809
return self.open(a_bzrdir, _found=True, )
812
super(BzrBranchFormat5, self).__init__()
813
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
815
def open(self, a_bzrdir, _found=False):
816
"""Return the branch object for a_bzrdir
818
_found is a private parameter, do not use it. It is used to indicate
819
if format probing has already be done.
822
format = BranchFormat.find_format(a_bzrdir)
823
assert format.__class__ == self.__class__
824
transport = a_bzrdir.get_branch_transport(None)
825
control_files = lockable_files.LockableFiles(transport, 'lock',
827
return BzrBranch5(_format=self,
828
_control_files=control_files,
830
_repository=a_bzrdir.find_repository())
833
return "Bazaar-NG Metadir branch format 5"
2078
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2080
def supports_tags(self):
2084
class BzrBranchFormat6(BranchFormatMetadir):
2085
"""Branch format with last-revision and tags.
2087
Unlike previous formats, this has no explicit revision history. Instead,
2088
this just stores the last-revision, and the left-hand history leading
2089
up to there is the history.
2091
This format was introduced in bzr 0.15
2092
and became the default in 0.91.
2095
def _branch_class(self):
2098
def get_format_string(self):
2099
"""See BranchFormat.get_format_string()."""
2100
return "Bazaar Branch Format 6 (bzr 0.15)\n"
2102
def get_format_description(self):
2103
"""See BranchFormat.get_format_description()."""
2104
return "Branch format 6"
2106
def initialize(self, a_bzrdir, name=None, repository=None):
2107
"""Create a branch of this format in a_bzrdir."""
2108
utf8_files = [('last-revision', '0 null:\n'),
2109
('branch.conf', ''),
2112
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2114
def make_tags(self, branch):
2115
"""See bzrlib.branch.BranchFormat.make_tags()."""
2116
return BasicTags(branch)
2118
def supports_set_append_revisions_only(self):
2122
class BzrBranchFormat8(BranchFormatMetadir):
2123
"""Metadir format supporting storing locations of subtree branches."""
2125
def _branch_class(self):
2128
def get_format_string(self):
2129
"""See BranchFormat.get_format_string()."""
2130
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
2132
def get_format_description(self):
2133
"""See BranchFormat.get_format_description()."""
2134
return "Branch format 8"
2136
def initialize(self, a_bzrdir, name=None, repository=None):
2137
"""Create a branch of this format in a_bzrdir."""
2138
utf8_files = [('last-revision', '0 null:\n'),
2139
('branch.conf', ''),
2143
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2145
def make_tags(self, branch):
2146
"""See bzrlib.branch.BranchFormat.make_tags()."""
2147
return BasicTags(branch)
2149
def supports_set_append_revisions_only(self):
2152
def supports_stacking(self):
2155
supports_reference_locations = True
2158
class BzrBranchFormat7(BranchFormatMetadir):
2159
"""Branch format with last-revision, tags, and a stacked location pointer.
2161
The stacked location pointer is passed down to the repository and requires
2162
a repository format with supports_external_lookups = True.
2164
This format was introduced in bzr 1.6.
2167
def initialize(self, a_bzrdir, name=None, repository=None):
2168
"""Create a branch of this format in a_bzrdir."""
2169
utf8_files = [('last-revision', '0 null:\n'),
2170
('branch.conf', ''),
2173
return self._initialize_helper(a_bzrdir, utf8_files, name, repository)
2175
def _branch_class(self):
2178
def get_format_string(self):
2179
"""See BranchFormat.get_format_string()."""
2180
return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
2182
def get_format_description(self):
2183
"""See BranchFormat.get_format_description()."""
2184
return "Branch format 7"
2186
def supports_set_append_revisions_only(self):
2189
def supports_stacking(self):
2192
def make_tags(self, branch):
2193
"""See bzrlib.branch.BranchFormat.make_tags()."""
2194
return BasicTags(branch)
2196
supports_reference_locations = False
836
2199
class BranchReferenceFormat(BranchFormat):
851
2214
def get_format_description(self):
852
2215
"""See BranchFormat.get_format_description()."""
853
2216
return "Checkout reference format 1"
855
def initialize(self, a_bzrdir, target_branch=None):
2218
def get_reference(self, a_bzrdir, name=None):
2219
"""See BranchFormat.get_reference()."""
2220
transport = a_bzrdir.get_branch_transport(None, name=name)
2221
return transport.get_bytes('location')
2223
def set_reference(self, a_bzrdir, name, to_branch):
2224
"""See BranchFormat.set_reference()."""
2225
transport = a_bzrdir.get_branch_transport(None, name=name)
2226
location = transport.put_bytes('location', to_branch.base)
2228
def initialize(self, a_bzrdir, name=None, target_branch=None,
856
2230
"""Create a branch of this format in a_bzrdir."""
857
2231
if target_branch is None:
858
2232
# this format does not implement branch itself, thus the implicit
859
2233
# creation contract must see it as uninitializable
860
2234
raise errors.UninitializableFormat(self)
861
mutter('creating branch reference in %s', a_bzrdir.transport.base)
862
branch_transport = a_bzrdir.get_branch_transport(self)
2235
mutter('creating branch reference in %s', a_bzrdir.user_url)
2236
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
863
2237
branch_transport.put_bytes('location',
864
target_branch.bzrdir.root_transport.base)
2238
target_branch.bzrdir.user_url)
865
2239
branch_transport.put_bytes('format', self.get_format_string())
866
return self.open(a_bzrdir, _found=True)
2241
a_bzrdir, name, _found=True,
2242
possible_transports=[target_branch.bzrdir.root_transport])
2243
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
868
2246
def __init__(self):
869
2247
super(BranchReferenceFormat, self).__init__()
870
2248
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2249
self._matchingbzrdir.set_branch_format(self)
872
2251
def _make_reference_clone_function(format, a_branch):
873
2252
"""Create a clone() routine for a branch dynamically."""
874
def clone(to_bzrdir, revision_id=None):
2253
def clone(to_bzrdir, revision_id=None,
2254
repository_policy=None):
875
2255
"""See Branch.clone()."""
876
return format.initialize(to_bzrdir, a_branch)
2256
return format.initialize(to_bzrdir, target_branch=a_branch)
877
2257
# cannot obey revision_id limits when cloning a reference ...
878
2258
# FIXME RBC 20060210 either nuke revision_id for clone, or
879
2259
# emit some sort of warning/error to the caller ?!
882
def open(self, a_bzrdir, _found=False):
2262
def open(self, a_bzrdir, name=None, _found=False, location=None,
2263
possible_transports=None, ignore_fallbacks=False,
2264
found_repository=None):
883
2265
"""Return the branch that the branch reference in a_bzrdir points at.
885
_found is a private parameter, do not use it. It is used to indicate
886
if format probing has already be done.
2267
:param a_bzrdir: A BzrDir that contains a branch.
2268
:param name: Name of colocated branch to open, if any
2269
:param _found: a private parameter, do not use it. It is used to
2270
indicate if format probing has already be done.
2271
:param ignore_fallbacks: when set, no fallback branches will be opened
2272
(if there are any). Default is to open fallbacks.
2273
:param location: The location of the referenced branch. If
2274
unspecified, this will be determined from the branch reference in
2276
:param possible_transports: An optional reusable transports list.
889
format = BranchFormat.find_format(a_bzrdir)
890
assert format.__class__ == self.__class__
891
transport = a_bzrdir.get_branch_transport(None)
892
real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
893
result = real_bzrdir.open_branch()
2279
format = BranchFormat.find_format(a_bzrdir, name=name)
2280
if format.__class__ != self.__class__:
2281
raise AssertionError("wrong format %r found for %r" %
2283
if location is None:
2284
location = self.get_reference(a_bzrdir, name)
2285
real_bzrdir = bzrdir.BzrDir.open(
2286
location, possible_transports=possible_transports)
2287
result = real_bzrdir.open_branch(name=name,
2288
ignore_fallbacks=ignore_fallbacks)
894
2289
# this changes the behaviour of result.clone to create a new reference
895
2290
# rather than a copy of the content of the branch.
896
2291
# I did not use a proxy object because that needs much more extensive
2301
class BranchFormatRegistry(controldir.ControlComponentFormatRegistry):
2302
"""Branch format registry."""
2304
def __init__(self, other_registry=None):
2305
super(BranchFormatRegistry, self).__init__(other_registry)
2306
self._default_format = None
2308
def set_default(self, format):
2309
self._default_format = format
2311
def get_default(self):
2312
return self._default_format
2315
network_format_registry = registry.FormatRegistry()
2316
"""Registry of formats indexed by their network name.
2318
The network name for a branch format is an identifier that can be used when
2319
referring to formats with smart server operations. See
2320
BranchFormat.network_name() for more detail.
2323
format_registry = BranchFormatRegistry(network_format_registry)
906
2326
# formats which have no format string are not discoverable
907
2327
# and not independently creatable, so are not registered.
908
__default_format = BzrBranchFormat5()
909
BranchFormat.register_format(__default_format)
910
BranchFormat.register_format(BranchReferenceFormat())
911
BranchFormat.set_default_format(__default_format)
912
_legacy_formats = [BzrBranchFormat4(),
915
class BzrBranch(Branch):
2328
__format5 = BzrBranchFormat5()
2329
__format6 = BzrBranchFormat6()
2330
__format7 = BzrBranchFormat7()
2331
__format8 = BzrBranchFormat8()
2332
format_registry.register(__format5)
2333
format_registry.register(BranchReferenceFormat())
2334
format_registry.register(__format6)
2335
format_registry.register(__format7)
2336
format_registry.register(__format8)
2337
format_registry.set_default(__format7)
2340
class BranchWriteLockResult(LogicalLockResult):
2341
"""The result of write locking a branch.
2343
:ivar branch_token: The token obtained from the underlying branch lock, or
2345
:ivar unlock: A callable which will unlock the lock.
2348
def __init__(self, unlock, branch_token):
2349
LogicalLockResult.__init__(self, unlock)
2350
self.branch_token = branch_token
2353
return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2357
class BzrBranch(Branch, _RelockDebugMixin):
916
2358
"""A branch stored in the actual filesystem.
918
2360
Note that it's "local" in the context of the filesystem; it doesn't
919
2361
really matter if it's on an nfs/smb/afs/coda/... share, as long as
920
2362
it's writable, and can be accessed via the normal filesystem API.
2364
:ivar _transport: Transport for file operations on this branch's
2365
control files, typically pointing to the .bzr/branch directory.
2366
:ivar repository: Repository for this branch.
2367
:ivar base: The url of the base directory for this branch; the one
2368
containing the .bzr directory.
2369
:ivar name: Optional colocated branch name as it exists in the control
923
def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
924
relax_version_check=DEPRECATED_PARAMETER, _format=None,
925
_control_files=None, a_bzrdir=None, _repository=None):
926
"""Create new branch object at a particular location.
928
transport -- A Transport object, defining how to access files.
930
init -- If True, create new control files in a previously
931
unversioned directory. If False, the branch must already
934
relax_version_check -- If true, the usual check for the branch
935
version is not applied. This is intended only for
936
upgrade/recovery type use; it's not guaranteed that
937
all operations will work on old format branches.
2373
def __init__(self, _format=None,
2374
_control_files=None, a_bzrdir=None, name=None,
2375
_repository=None, ignore_fallbacks=False):
2376
"""Create new branch object at a particular location."""
939
2377
if a_bzrdir is None:
940
self.bzrdir = bzrdir.BzrDir.open(transport.base)
2378
raise ValueError('a_bzrdir must be supplied')
942
2380
self.bzrdir = a_bzrdir
943
self._transport = self.bzrdir.transport.clone('..')
944
self._base = self._transport.base
2381
self._base = self.bzrdir.transport.clone('..').base
2383
# XXX: We should be able to just do
2384
# self.base = self.bzrdir.root_transport.base
2385
# but this does not quite work yet -- mbp 20080522
945
2386
self._format = _format
946
2387
if _control_files is None:
947
2388
raise ValueError('BzrBranch _control_files is None')
948
2389
self.control_files = _control_files
949
if deprecated_passed(init):
950
warn("BzrBranch.__init__(..., init=XXX): The init parameter is "
951
"deprecated as of bzr 0.8. Please use Branch.create().",
955
# this is slower than before deprecation, oh well never mind.
957
self._initialize(transport.base)
958
self._check_format(_format)
959
if deprecated_passed(relax_version_check):
960
warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
961
"relax_version_check parameter is deprecated as of bzr 0.8. "
962
"Please use BzrDir.open_downlevel, or a BzrBranchFormat's "
966
if (not relax_version_check
967
and not self._format.is_supported()):
968
raise errors.UnsupportedFormatError(format=fmt)
969
if deprecated_passed(transport):
970
warn("BzrBranch.__init__(transport=XXX...): The transport "
971
"parameter is deprecated as of bzr 0.8. "
972
"Please use Branch.open, or bzrdir.open_branch().",
2390
self._transport = _control_files._transport
975
2391
self.repository = _repository
2392
Branch.__init__(self)
977
2394
def __str__(self):
978
return '%s(%r)' % (self.__class__.__name__, self.base)
2395
if self.name is None:
2396
return '%s(%s)' % (self.__class__.__name__, self.user_url)
2398
return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
980
2401
__repr__ = __str__
982
2403
def _get_base(self):
2404
"""Returns the directory containing the control directory."""
983
2405
return self._base
985
2407
base = property(_get_base, doc="The URL for the root of this branch.")
987
def _finish_transaction(self):
988
"""Exit the current transaction."""
989
return self.control_files._finish_transaction()
991
def get_transaction(self):
992
"""Return the current active transaction.
994
If no transaction is active, this returns a passthrough object
995
for which all data is immediately flushed and no caching happens.
997
# this is an explicit function so that we can do tricky stuff
998
# when the storage in rev_storage is elsewhere.
999
# we probably need to hook the two 'lock a location' and
1000
# 'have a transaction' together more delicately, so that
1001
# we can have two locks (branch and storage) and one transaction
1002
# ... and finishing the transaction unlocks both, but unlocking
1003
# does not. - RBC 20051121
1004
return self.control_files.get_transaction()
1006
def _set_transaction(self, transaction):
1007
"""Set a new active transaction."""
1008
return self.control_files._set_transaction(transaction)
1010
def abspath(self, name):
1011
"""See Branch.abspath."""
1012
return self.control_files._transport.abspath(name)
1014
def _check_format(self, format):
1015
"""Identify the branch format if needed.
1017
The format is stored as a reference to the format object in
1018
self._format for code that needs to check it later.
1020
The format parameter is either None or the branch format class
1021
used to open this branch.
1023
FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
1026
format = BranchFormat.find_format(self.bzrdir)
1027
self._format = format
1028
mutter("got branch format %s", self._format)
1031
def get_root_id(self):
1032
"""See Branch.get_root_id."""
1033
tree = self.repository.revision_tree(self.last_revision())
1034
return tree.inventory.root.file_id
2409
def _get_config(self):
2410
return TransportConfig(self._transport, 'branch.conf')
1036
2412
def is_locked(self):
1037
2413
return self.control_files.is_locked()
1039
def lock_write(self):
1040
self.repository.lock_write()
2415
def lock_write(self, token=None):
2416
"""Lock the branch for write operations.
2418
:param token: A token to permit reacquiring a previously held and
2420
:return: A BranchWriteLockResult.
2422
if not self.is_locked():
2423
self._note_lock('w')
2424
# All-in-one needs to always unlock/lock.
2425
repo_control = getattr(self.repository, 'control_files', None)
2426
if self.control_files == repo_control or not self.is_locked():
2427
self.repository._warn_if_deprecated(self)
2428
self.repository.lock_write()
1042
self.control_files.lock_write()
2433
return BranchWriteLockResult(self.unlock,
2434
self.control_files.lock_write(token=token))
1044
self.repository.unlock()
2437
self.repository.unlock()
1047
2440
def lock_read(self):
1048
self.repository.lock_read()
2441
"""Lock the branch for read operations.
2443
:return: A bzrlib.lock.LogicalLockResult.
2445
if not self.is_locked():
2446
self._note_lock('r')
2447
# All-in-one needs to always unlock/lock.
2448
repo_control = getattr(self.repository, 'control_files', None)
2449
if self.control_files == repo_control or not self.is_locked():
2450
self.repository._warn_if_deprecated(self)
2451
self.repository.lock_read()
1050
2456
self.control_files.lock_read()
2457
return LogicalLockResult(self.unlock)
1052
self.repository.unlock()
2460
self.repository.unlock()
2463
@only_raises(errors.LockNotHeld, errors.LockBroken)
1055
2464
def unlock(self):
1056
# TODO: test for failed two phase locks. This is known broken.
1058
2466
self.control_files.unlock()
1060
self.repository.unlock()
2468
# All-in-one needs to always unlock/lock.
2469
repo_control = getattr(self.repository, 'control_files', None)
2470
if (self.control_files == repo_control or
2471
not self.control_files.is_locked()):
2472
self.repository.unlock()
2473
if not self.control_files.is_locked():
2474
# we just released the lock
2475
self._clear_cached_state()
1062
2477
def peek_lock_mode(self):
1063
2478
if self.control_files._lock_count == 0:
1073
2488
"""See Branch.print_file."""
1074
2489
return self.repository.print_file(file, revision_id)
1077
def append_revision(self, *revision_ids):
1078
"""See Branch.append_revision."""
1079
for revision_id in revision_ids:
1080
mutter("add {%s} to revision-history" % revision_id)
1081
rev_history = self.revision_history()
1082
rev_history.extend(revision_ids)
1083
self.set_revision_history(rev_history)
2491
def _write_revision_history(self, history):
2492
"""Factored out of set_revision_history.
2494
This performs the actual writing to disk.
2495
It is intended to be called by BzrBranch5.set_revision_history."""
2496
self._transport.put_bytes(
2497
'revision-history', '\n'.join(history),
2498
mode=self.bzrdir._get_file_mode())
2500
@deprecated_method(deprecated_in((2, 4, 0)))
1086
2501
def set_revision_history(self, rev_history):
1087
2502
"""See Branch.set_revision_history."""
1088
self.control_files.put_utf8(
1089
'revision-history', '\n'.join(rev_history))
1090
transaction = self.get_transaction()
1091
history = transaction.map.find_revision_history()
1092
if history is not None:
1093
# update the revision history in the identity map.
1094
history[:] = list(rev_history)
1095
# this call is disabled because revision_history is
1096
# not really an object yet, and the transaction is for objects.
1097
# transaction.register_dirty(history)
1099
transaction.map.add_revision_history(rev_history)
1100
# this call is disabled because revision_history is
1101
# not really an object yet, and the transaction is for objects.
1102
# transaction.register_clean(history)
1105
def revision_history(self):
1106
"""See Branch.revision_history."""
1107
transaction = self.get_transaction()
1108
history = transaction.map.find_revision_history()
1109
if history is not None:
1110
# mutter("cache hit for revision-history in %s", self)
1111
return list(history)
1112
decode_utf8 = cache_utf8.decode
1113
history = [decode_utf8(l.rstrip('\r\n')) for l in
1114
self.control_files.get('revision-history').readlines()]
1115
transaction.map.add_revision_history(history)
1116
# this call is disabled because revision_history is
1117
# not really an object yet, and the transaction is for objects.
1118
# transaction.register_clean(history, precious=True)
1119
return list(history)
1122
def generate_revision_history(self, revision_id, last_rev=None,
2503
self._set_revision_history(rev_history)
2506
def _set_revision_history(self, rev_history):
2507
if 'evil' in debug.debug_flags:
2508
mutter_callsite(3, "set_revision_history scales with history.")
2509
check_not_reserved_id = _mod_revision.check_not_reserved_id
2510
for rev_id in rev_history:
2511
check_not_reserved_id(rev_id)
2512
if Branch.hooks['post_change_branch_tip']:
2513
# Don't calculate the last_revision_info() if there are no hooks
2515
old_revno, old_revid = self.last_revision_info()
2516
if len(rev_history) == 0:
2517
revid = _mod_revision.NULL_REVISION
2519
revid = rev_history[-1]
2520
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2521
self._write_revision_history(rev_history)
2522
self._clear_cached_state()
2523
self._cache_revision_history(rev_history)
2524
for hook in Branch.hooks['set_rh']:
2525
hook(self, rev_history)
2526
if Branch.hooks['post_change_branch_tip']:
2527
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2529
def _synchronize_history(self, destination, revision_id):
2530
"""Synchronize last revision and revision history between branches.
2532
This version is most efficient when the destination is also a
2533
BzrBranch5, but works for BzrBranch6 as long as the revision
2534
history is the true lefthand parent history, and all of the revisions
2535
are in the destination's repository. If not, set_revision_history
2538
:param destination: The branch to copy the history into
2539
:param revision_id: The revision-id to truncate history at. May
2540
be None to copy complete history.
2542
if not isinstance(destination._format, BzrBranchFormat5):
2543
super(BzrBranch, self)._synchronize_history(
2544
destination, revision_id)
2546
if revision_id == _mod_revision.NULL_REVISION:
2549
new_history = self.revision_history()
2550
if revision_id is not None and new_history != []:
2552
new_history = new_history[:new_history.index(revision_id) + 1]
2554
rev = self.repository.get_revision(revision_id)
2555
new_history = rev.get_history(self.repository)[1:]
2556
destination._set_revision_history(new_history)
2559
def set_last_revision_info(self, revno, revision_id):
2560
"""Set the last revision of this branch.
2562
The caller is responsible for checking that the revno is correct
2563
for this revision id.
2565
It may be possible to set the branch last revision to an id not
2566
present in the repository. However, branches can also be
2567
configured to check constraints on history, in which case this may not
2570
if not revision_id or not isinstance(revision_id, basestring):
2571
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2572
# this old format stores the full history, but this api doesn't
2573
# provide it, so we must generate, and might as well check it's
2575
history = self._lefthand_history(revision_id)
2576
if len(history) != revno:
2577
raise AssertionError('%d != %d' % (len(history), revno))
2578
self._set_revision_history(history)
2580
def _gen_revision_history(self):
2581
history = self._transport.get_bytes('revision-history').split('\n')
2582
if history[-1:] == ['']:
2583
# There shouldn't be a trailing newline, but just in case.
2588
def generate_revision_history(self, revision_id, last_rev=None,
1123
2589
other_branch=None):
1124
2590
"""Create a new revision history that will finish with revision_id.
1126
2592
:param revision_id: the new tip to use.
1127
2593
:param last_rev: The previous last_revision. If not None, then this
1128
2594
must be a ancestory of revision_id, or DivergedBranches is raised.
1129
2595
:param other_branch: The other branch that DivergedBranches should
1130
2596
raise with respect to.
1132
# stop_revision must be a descendant of last_revision
1133
stop_graph = self.repository.get_revision_graph(revision_id)
1134
if last_rev is not None and last_rev not in stop_graph:
1135
# our previous tip is not merged into stop_revision
1136
raise errors.DivergedBranches(self, other_branch)
1137
# make a new revision history from the graph
1138
current_rev_id = revision_id
1140
while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1141
new_history.append(current_rev_id)
1142
current_rev_id_parents = stop_graph[current_rev_id]
1144
current_rev_id = current_rev_id_parents[0]
1146
current_rev_id = None
1147
new_history.reverse()
1148
self.set_revision_history(new_history)
1151
def update_revisions(self, other, stop_revision=None):
1152
"""See Branch.update_revisions."""
1155
if stop_revision is None:
1156
stop_revision = other.last_revision()
1157
if stop_revision is None:
1158
# if there are no commits, we're done.
1160
# whats the current last revision, before we fetch [and change it
1162
last_rev = self.last_revision()
1163
# we fetch here regardless of whether we need to so that we pickup
1165
self.fetch(other, stop_revision)
1166
my_ancestry = self.repository.get_ancestry(last_rev)
1167
if stop_revision in my_ancestry:
1168
# last_revision is a descendant of stop_revision
1170
self.generate_revision_history(stop_revision, last_rev=last_rev,
2598
self._set_revision_history(self._lefthand_history(revision_id,
2599
last_rev, other_branch))
1175
2601
def basis_tree(self):
1176
2602
"""See Branch.basis_tree."""
1177
2603
return self.repository.revision_tree(self.last_revision())
1179
@deprecated_method(zero_eight)
1180
def working_tree(self):
1181
"""Create a Working tree object for this branch."""
1183
from bzrlib.transport.local import LocalTransport
1184
if (self.base.find('://') != -1 or
1185
not isinstance(self._transport, LocalTransport)):
1186
raise NoWorkingTree(self.base)
1187
return self.bzrdir.open_workingtree()
1190
def pull(self, source, overwrite=False, stop_revision=None):
1191
"""See Branch.pull."""
1194
old_count = len(self.revision_history())
1196
self.update_revisions(source, stop_revision)
1197
except DivergedBranches:
1201
self.set_revision_history(source.revision_history())
1202
new_count = len(self.revision_history())
1203
return new_count - old_count
1207
def get_parent(self):
1208
"""See Branch.get_parent."""
2605
def _get_parent_location(self):
1210
2606
_locs = ['parent', 'pull', 'x-pull']
1211
assert self.base[-1] == '/'
1212
2607
for l in _locs:
1214
parent = self.control_files.get(l).read().strip('\n')
1217
# This is an old-format absolute path to a local branch
1218
# turn it into a url
1219
if parent.startswith('/'):
1220
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1222
return urlutils.join(self.base[:-1], parent)
1223
except errors.InvalidURLJoin, e:
1224
raise errors.InaccessibleParent(parent, self.base)
2609
return self._transport.get_bytes(l).strip('\n')
2610
except errors.NoSuchFile:
1227
def get_push_location(self):
1228
"""See Branch.get_push_location."""
1229
push_loc = self.get_config().get_user_option('push_location')
2614
def _basic_push(self, target, overwrite, stop_revision):
2615
"""Basic implementation of push without bound branches or hooks.
2617
Must be called with source read locked and target write locked.
2619
result = BranchPushResult()
2620
result.source_branch = self
2621
result.target_branch = target
2622
result.old_revno, result.old_revid = target.last_revision_info()
2623
self.update_references(target)
2624
if result.old_revid != stop_revision:
2625
# We assume that during 'push' this repository is closer than
2627
graph = self.repository.get_graph(target.repository)
2628
target.update_revisions(self, stop_revision,
2629
overwrite=overwrite, graph=graph)
2630
if self._push_should_merge_tags():
2631
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
2632
result.new_revno, result.new_revid = target.last_revision_info()
2635
def get_stacked_on_url(self):
2636
raise errors.UnstackableBranchFormat(self._format, self.user_url)
1232
2638
def set_push_location(self, location):
1233
2639
"""See Branch.set_push_location."""
1381
2732
return self.set_bound_location(None)
1383
2734
@needs_write_lock
1385
"""Synchronise this branch with the master branch if any.
2735
def update(self, possible_transports=None):
2736
"""Synchronise this branch with the master branch if any.
1387
2738
:return: None or the last_revision that was pivoted out during the
1390
master = self.get_master_branch()
2741
master = self.get_master_branch(possible_transports)
1391
2742
if master is not None:
1392
old_tip = self.last_revision()
2743
old_tip = _mod_revision.ensure_null(self.last_revision())
1393
2744
self.pull(master, overwrite=True)
1394
if old_tip in self.repository.get_ancestry(self.last_revision()):
2745
if self.repository.get_graph().is_ancestor(old_tip,
2746
_mod_revision.ensure_null(self.last_revision())):
1400
class BranchTestProviderAdapter(object):
1401
"""A tool to generate a suite testing multiple branch formats at once.
1403
This is done by copying the test once for each transport and injecting
1404
the transport_server, transport_readonly_server, and branch_format
1405
classes into each copy. Each copy is also given a new id() to make it
1409
def __init__(self, transport_server, transport_readonly_server, formats):
1410
self._transport_server = transport_server
1411
self._transport_readonly_server = transport_readonly_server
1412
self._formats = formats
1414
def adapt(self, test):
1415
result = TestSuite()
1416
for branch_format, bzrdir_format in self._formats:
1417
new_test = deepcopy(test)
1418
new_test.transport_server = self._transport_server
1419
new_test.transport_readonly_server = self._transport_readonly_server
1420
new_test.bzrdir_format = bzrdir_format
1421
new_test.branch_format = branch_format
1422
def make_new_test_id():
1423
new_id = "%s(%s)" % (new_test.id(), branch_format.__class__.__name__)
1424
return lambda: new_id
1425
new_test.id = make_new_test_id()
1426
result.addTest(new_test)
2752
class BzrBranch8(BzrBranch5):
2753
"""A branch that stores tree-reference locations."""
2755
def _open_hook(self):
2756
if self._ignore_fallbacks:
2759
url = self.get_stacked_on_url()
2760
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2761
errors.UnstackableBranchFormat):
2764
for hook in Branch.hooks['transform_fallback_location']:
2765
url = hook(self, url)
2767
hook_name = Branch.hooks.get_hook_name(hook)
2768
raise AssertionError(
2769
"'transform_fallback_location' hook %s returned "
2770
"None, not a URL." % hook_name)
2771
self._activate_fallback_location(url)
2773
def __init__(self, *args, **kwargs):
2774
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2775
super(BzrBranch8, self).__init__(*args, **kwargs)
2776
self._last_revision_info_cache = None
2777
self._reference_info = None
2779
def _clear_cached_state(self):
2780
super(BzrBranch8, self)._clear_cached_state()
2781
self._last_revision_info_cache = None
2782
self._reference_info = None
2784
def _last_revision_info(self):
2785
revision_string = self._transport.get_bytes('last-revision')
2786
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2787
revision_id = cache_utf8.get_cached_utf8(revision_id)
2789
return revno, revision_id
2791
def _write_last_revision_info(self, revno, revision_id):
2792
"""Simply write out the revision id, with no checks.
2794
Use set_last_revision_info to perform this safely.
2796
Does not update the revision_history cache.
2797
Intended to be called by set_last_revision_info and
2798
_write_revision_history.
2800
revision_id = _mod_revision.ensure_null(revision_id)
2801
out_string = '%d %s\n' % (revno, revision_id)
2802
self._transport.put_bytes('last-revision', out_string,
2803
mode=self.bzrdir._get_file_mode())
2806
def set_last_revision_info(self, revno, revision_id):
2807
if not revision_id or not isinstance(revision_id, basestring):
2808
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2809
old_revno, old_revid = self.last_revision_info()
2810
if self._get_append_revisions_only():
2811
self._check_history_violation(revision_id)
2812
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2813
self._write_last_revision_info(revno, revision_id)
2814
self._clear_cached_state()
2815
self._last_revision_info_cache = revno, revision_id
2816
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2818
def _synchronize_history(self, destination, revision_id):
2819
"""Synchronize last revision and revision history between branches.
2821
:see: Branch._synchronize_history
2823
# XXX: The base Branch has a fast implementation of this method based
2824
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2825
# that uses set_revision_history. This class inherits from BzrBranch5,
2826
# but wants the fast implementation, so it calls
2827
# Branch._synchronize_history directly.
2828
Branch._synchronize_history(self, destination, revision_id)
2830
def _check_history_violation(self, revision_id):
2831
last_revision = _mod_revision.ensure_null(self.last_revision())
2832
if _mod_revision.is_null(last_revision):
2834
if last_revision not in self._lefthand_history(revision_id):
2835
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2837
def _gen_revision_history(self):
2838
"""Generate the revision history from last revision
2840
last_revno, last_revision = self.last_revision_info()
2841
self._extend_partial_history(stop_index=last_revno-1)
2842
return list(reversed(self._partial_revision_history_cache))
2844
def _write_revision_history(self, history):
2845
"""Factored out of set_revision_history.
2847
This performs the actual writing to disk, with format-specific checks.
2848
It is intended to be called by BzrBranch5.set_revision_history.
2850
if len(history) == 0:
2851
last_revision = 'null:'
2853
if history != self._lefthand_history(history[-1]):
2854
raise errors.NotLefthandHistory(history)
2855
last_revision = history[-1]
2856
if self._get_append_revisions_only():
2857
self._check_history_violation(last_revision)
2858
self._write_last_revision_info(len(history), last_revision)
2861
def _set_parent_location(self, url):
2862
"""Set the parent branch"""
2863
self._set_config_location('parent_location', url, make_relative=True)
2866
def _get_parent_location(self):
2867
"""Set the parent branch"""
2868
return self._get_config_location('parent_location')
2871
def _set_all_reference_info(self, info_dict):
2872
"""Replace all reference info stored in a branch.
2874
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2877
writer = rio.RioWriter(s)
2878
for key, (tree_path, branch_location) in info_dict.iteritems():
2879
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2880
branch_location=branch_location)
2881
writer.write_stanza(stanza)
2882
self._transport.put_bytes('references', s.getvalue())
2883
self._reference_info = info_dict
2886
def _get_all_reference_info(self):
2887
"""Return all the reference info stored in a branch.
2889
:return: A dict of {file_id: (tree_path, branch_location)}
2891
if self._reference_info is not None:
2892
return self._reference_info
2893
rio_file = self._transport.get('references')
2895
stanzas = rio.read_stanzas(rio_file)
2896
info_dict = dict((s['file_id'], (s['tree_path'],
2897
s['branch_location'])) for s in stanzas)
2900
self._reference_info = info_dict
2903
def set_reference_info(self, file_id, tree_path, branch_location):
2904
"""Set the branch location to use for a tree reference.
2906
:param file_id: The file-id of the tree reference.
2907
:param tree_path: The path of the tree reference in the tree.
2908
:param branch_location: The location of the branch to retrieve tree
2911
info_dict = self._get_all_reference_info()
2912
info_dict[file_id] = (tree_path, branch_location)
2913
if None in (tree_path, branch_location):
2914
if tree_path is not None:
2915
raise ValueError('tree_path must be None when branch_location'
2917
if branch_location is not None:
2918
raise ValueError('branch_location must be None when tree_path'
2920
del info_dict[file_id]
2921
self._set_all_reference_info(info_dict)
2923
def get_reference_info(self, file_id):
2924
"""Get the tree_path and branch_location for a tree reference.
2926
:return: a tuple of (tree_path, branch_location)
2928
return self._get_all_reference_info().get(file_id, (None, None))
2930
def reference_parent(self, file_id, path, possible_transports=None):
2931
"""Return the parent branch for a tree-reference file_id.
2933
:param file_id: The file_id of the tree reference
2934
:param path: The path of the file_id in the tree
2935
:return: A branch associated with the file_id
2937
branch_location = self.get_reference_info(file_id)[1]
2938
if branch_location is None:
2939
return Branch.reference_parent(self, file_id, path,
2940
possible_transports)
2941
branch_location = urlutils.join(self.user_url, branch_location)
2942
return Branch.open(branch_location,
2943
possible_transports=possible_transports)
2945
def set_push_location(self, location):
2946
"""See Branch.set_push_location."""
2947
self._set_config_location('push_location', location)
2949
def set_bound_location(self, location):
2950
"""See Branch.set_push_location."""
2951
self._master_branch_cache = None
2953
config = self.get_config()
2954
if location is None:
2955
if config.get_user_option('bound') != 'True':
2958
config.set_user_option('bound', 'False', warn_masked=True)
2961
self._set_config_location('bound_location', location,
2963
config.set_user_option('bound', 'True', warn_masked=True)
2966
def _get_bound_location(self, bound):
2967
"""Return the bound location in the config file.
2969
Return None if the bound parameter does not match"""
2970
config = self.get_config()
2971
config_bound = (config.get_user_option('bound') == 'True')
2972
if config_bound != bound:
2974
return self._get_config_location('bound_location', config=config)
2976
def get_bound_location(self):
2977
"""See Branch.set_push_location."""
2978
return self._get_bound_location(True)
2980
def get_old_bound_location(self):
2981
"""See Branch.get_old_bound_location"""
2982
return self._get_bound_location(False)
2984
def get_stacked_on_url(self):
2985
# you can always ask for the URL; but you might not be able to use it
2986
# if the repo can't support stacking.
2987
## self._check_stackable_repo()
2988
stacked_url = self._get_config_location('stacked_on_location')
2989
if stacked_url is None:
2990
raise errors.NotStacked(self)
2993
def _get_append_revisions_only(self):
2994
return self.get_config(
2995
).get_user_option_as_bool('append_revisions_only')
2998
def generate_revision_history(self, revision_id, last_rev=None,
3000
"""See BzrBranch5.generate_revision_history"""
3001
history = self._lefthand_history(revision_id, last_rev, other_branch)
3002
revno = len(history)
3003
self.set_last_revision_info(revno, revision_id)
3006
def get_rev_id(self, revno, history=None):
3007
"""Find the revision id of the specified revno."""
3009
return _mod_revision.NULL_REVISION
3011
last_revno, last_revision_id = self.last_revision_info()
3012
if revno <= 0 or revno > last_revno:
3013
raise errors.NoSuchRevision(self, revno)
3015
if history is not None:
3016
return history[revno - 1]
3018
index = last_revno - revno
3019
if len(self._partial_revision_history_cache) <= index:
3020
self._extend_partial_history(stop_index=index)
3021
if len(self._partial_revision_history_cache) > index:
3022
return self._partial_revision_history_cache[index]
3024
raise errors.NoSuchRevision(self, revno)
3027
def revision_id_to_revno(self, revision_id):
3028
"""Given a revision id, return its revno"""
3029
if _mod_revision.is_null(revision_id):
3032
index = self._partial_revision_history_cache.index(revision_id)
3035
self._extend_partial_history(stop_revision=revision_id)
3036
except errors.RevisionNotPresent, e:
3037
raise errors.GhostRevisionsHaveNoRevno(revision_id, e.revision_id)
3038
index = len(self._partial_revision_history_cache) - 1
3039
if self._partial_revision_history_cache[index] != revision_id:
3040
raise errors.NoSuchRevision(self, revision_id)
3041
return self.revno() - index
3044
class BzrBranch7(BzrBranch8):
3045
"""A branch with support for a fallback repository."""
3047
def set_reference_info(self, file_id, tree_path, branch_location):
3048
Branch.set_reference_info(self, file_id, tree_path, branch_location)
3050
def get_reference_info(self, file_id):
3051
Branch.get_reference_info(self, file_id)
3053
def reference_parent(self, file_id, path, possible_transports=None):
3054
return Branch.reference_parent(self, file_id, path,
3055
possible_transports)
3058
class BzrBranch6(BzrBranch7):
3059
"""See BzrBranchFormat6 for the capabilities of this branch.
3061
This subclass of BzrBranch7 disables the new features BzrBranch7 added,
3065
def get_stacked_on_url(self):
3066
raise errors.UnstackableBranchFormat(self._format, self.user_url)
3069
######################################################################
3070
# results of operations
3073
class _Result(object):
3075
def _show_tag_conficts(self, to_file):
3076
if not getattr(self, 'tag_conflicts', None):
3078
to_file.write('Conflicting tags:\n')
3079
for name, value1, value2 in self.tag_conflicts:
3080
to_file.write(' %s\n' % (name, ))
3083
class PullResult(_Result):
3084
"""Result of a Branch.pull operation.
3086
:ivar old_revno: Revision number before pull.
3087
:ivar new_revno: Revision number after pull.
3088
:ivar old_revid: Tip revision id before pull.
3089
:ivar new_revid: Tip revision id after pull.
3090
:ivar source_branch: Source (local) branch object. (read locked)
3091
:ivar master_branch: Master branch of the target, or the target if no
3093
:ivar local_branch: target branch if there is a Master, else None
3094
:ivar target_branch: Target/destination branch object. (write locked)
3095
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
3098
@deprecated_method(deprecated_in((2, 3, 0)))
3100
"""Return the relative change in revno.
3102
:deprecated: Use `new_revno` and `old_revno` instead.
3104
return self.new_revno - self.old_revno
3106
def report(self, to_file):
3108
if self.old_revid == self.new_revid:
3109
to_file.write('No revisions to pull.\n')
3111
to_file.write('Now on revision %d.\n' % self.new_revno)
3112
self._show_tag_conficts(to_file)
3115
class BranchPushResult(_Result):
3116
"""Result of a Branch.push operation.
3118
:ivar old_revno: Revision number (eg 10) of the target before push.
3119
:ivar new_revno: Revision number (eg 12) of the target after push.
3120
:ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
3122
:ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
3124
:ivar source_branch: Source branch object that the push was from. This is
3125
read locked, and generally is a local (and thus low latency) branch.
3126
:ivar master_branch: If target is a bound branch, the master branch of
3127
target, or target itself. Always write locked.
3128
:ivar target_branch: The direct Branch where data is being sent (write
3130
:ivar local_branch: If the target is a bound branch this will be the
3131
target, otherwise it will be None.
3134
@deprecated_method(deprecated_in((2, 3, 0)))
3136
"""Return the relative change in revno.
3138
:deprecated: Use `new_revno` and `old_revno` instead.
3140
return self.new_revno - self.old_revno
3142
def report(self, to_file):
3143
"""Write a human-readable description of the result."""
3144
if self.old_revid == self.new_revid:
3145
note('No new revisions to push.')
3147
note('Pushed up to revision %d.' % self.new_revno)
3148
self._show_tag_conficts(to_file)
1430
3151
class BranchCheckResult(object):
1436
3157
def __init__(self, branch):
1437
3158
self.branch = branch
1439
3161
def report_results(self, verbose):
1440
3162
"""Report the check results via trace.note.
1442
3164
:param verbose: Requests more detailed display of what was checked,
1445
note('checked branch %s format %s',
1447
self.branch._format)
1450
######################################################################
1454
@deprecated_function(zero_eight)
1455
def is_control_file(*args, **kwargs):
1456
"""See bzrlib.workingtree.is_control_file."""
1457
from bzrlib import workingtree
1458
return workingtree.is_control_file(*args, **kwargs)
3167
note('checked branch %s format %s', self.branch.user_url,
3168
self.branch._format)
3169
for error in self.errors:
3170
note('found error:%s', error)
3173
class Converter5to6(object):
3174
"""Perform an in-place upgrade of format 5 to format 6"""
3176
def convert(self, branch):
3177
# Data for 5 and 6 can peacefully coexist.
3178
format = BzrBranchFormat6()
3179
new_branch = format.open(branch.bzrdir, _found=True)
3181
# Copy source data into target
3182
new_branch._write_last_revision_info(*branch.last_revision_info())
3183
new_branch.set_parent(branch.get_parent())
3184
new_branch.set_bound_location(branch.get_bound_location())
3185
new_branch.set_push_location(branch.get_push_location())
3187
# New branch has no tags by default
3188
new_branch.tags._set_tag_dict({})
3190
# Copying done; now update target format
3191
new_branch._transport.put_bytes('format',
3192
format.get_format_string(),
3193
mode=new_branch.bzrdir._get_file_mode())
3195
# Clean up old files
3196
new_branch._transport.delete('revision-history')
3198
branch.set_parent(None)
3199
except errors.NoSuchFile:
3201
branch.set_bound_location(None)
3204
class Converter6to7(object):
3205
"""Perform an in-place upgrade of format 6 to format 7"""
3207
def convert(self, branch):
3208
format = BzrBranchFormat7()
3209
branch._set_config_location('stacked_on_location', '')
3210
# update target format
3211
branch._transport.put_bytes('format', format.get_format_string())
3214
class Converter7to8(object):
3215
"""Perform an in-place upgrade of format 6 to format 7"""
3217
def convert(self, branch):
3218
format = BzrBranchFormat8()
3219
branch._transport.put_bytes('references', '')
3220
# update target format
3221
branch._transport.put_bytes('format', format.get_format_string())
3224
def _run_with_write_locked_target(target, callable, *args, **kwargs):
3225
"""Run ``callable(*args, **kwargs)``, write-locking target for the
3228
_run_with_write_locked_target will attempt to release the lock it acquires.
3230
If an exception is raised by callable, then that exception *will* be
3231
propagated, even if the unlock attempt raises its own error. Thus
3232
_run_with_write_locked_target should be preferred to simply doing::
3236
return callable(*args, **kwargs)
3241
# This is very similar to bzrlib.decorators.needs_write_lock. Perhaps they
3242
# should share code?
3245
result = callable(*args, **kwargs)
3247
exc_info = sys.exc_info()
3251
raise exc_info[0], exc_info[1], exc_info[2]
3257
class InterBranch(InterObject):
3258
"""This class represents operations taking place between two branches.
3260
Its instances have methods like pull() and push() and contain
3261
references to the source and target repositories these operations
3262
can be carried out on.
3266
"""The available optimised InterBranch types."""
3269
def _get_branch_formats_to_test(klass):
3270
"""Return an iterable of format tuples for testing.
3272
:return: An iterable of (from_format, to_format) to use when testing
3273
this InterBranch class. Each InterBranch class should define this
3276
raise NotImplementedError(klass._get_branch_formats_to_test)
3279
def pull(self, overwrite=False, stop_revision=None,
3280
possible_transports=None, local=False):
3281
"""Mirror source into target branch.
3283
The target branch is considered to be 'local', having low latency.
3285
:returns: PullResult instance
3287
raise NotImplementedError(self.pull)
3290
def update_revisions(self, stop_revision=None, overwrite=False,
3292
"""Pull in new perfect-fit revisions.
3294
:param stop_revision: Updated until the given revision
3295
:param overwrite: Always set the branch pointer, rather than checking
3296
to see if it is a proper descendant.
3297
:param graph: A Graph object that can be used to query history
3298
information. This can be None.
3301
raise NotImplementedError(self.update_revisions)
3304
def push(self, overwrite=False, stop_revision=None,
3305
_override_hook_source_branch=None):
3306
"""Mirror the source branch into the target branch.
3308
The source branch is considered to be 'local', having low latency.
3310
raise NotImplementedError(self.push)
3313
def copy_content_into(self, revision_id=None):
3314
"""Copy the content of source into target
3316
revision_id: if not None, the revision history in the new branch will
3317
be truncated to end with revision_id.
3319
raise NotImplementedError(self.copy_content_into)
3322
def fetch(self, stop_revision=None):
3325
:param stop_revision: Last revision to fetch
3327
raise NotImplementedError(self.fetch)
3330
class GenericInterBranch(InterBranch):
3331
"""InterBranch implementation that uses public Branch functions."""
3334
def is_compatible(klass, source, target):
3335
# GenericBranch uses the public API, so always compatible
3339
def _get_branch_formats_to_test(klass):
3340
return [(format_registry.get_default(), format_registry.get_default())]
3343
def unwrap_format(klass, format):
3344
if isinstance(format, remote.RemoteBranchFormat):
3345
format._ensure_real()
3346
return format._custom_format
3350
def copy_content_into(self, revision_id=None):
3351
"""Copy the content of source into target
3353
revision_id: if not None, the revision history in the new branch will
3354
be truncated to end with revision_id.
3356
self.source.update_references(self.target)
3357
self.source._synchronize_history(self.target, revision_id)
3359
parent = self.source.get_parent()
3360
except errors.InaccessibleParent, e:
3361
mutter('parent was not accessible to copy: %s', e)
3364
self.target.set_parent(parent)
3365
if self.source._push_should_merge_tags():
3366
self.source.tags.merge_to(self.target.tags)
3369
def fetch(self, stop_revision=None):
3370
if self.target.base == self.source.base:
3372
self.source.lock_read()
3374
fetch_spec_factory = fetch.FetchSpecFactory()
3375
fetch_spec_factory.source_branch = self.source
3376
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3377
fetch_spec_factory.source_repo = self.source.repository
3378
fetch_spec_factory.target_repo = self.target.repository
3379
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3380
fetch_spec = fetch_spec_factory.make_fetch_spec()
3381
return self.target.repository.fetch(self.source.repository,
3382
fetch_spec=fetch_spec)
3384
self.source.unlock()
3387
def update_revisions(self, stop_revision=None, overwrite=False,
3389
"""See InterBranch.update_revisions()."""
3390
other_revno, other_last_revision = self.source.last_revision_info()
3391
stop_revno = None # unknown
3392
if stop_revision is None:
3393
stop_revision = other_last_revision
3394
if _mod_revision.is_null(stop_revision):
3395
# if there are no commits, we're done.
3397
stop_revno = other_revno
3399
# what's the current last revision, before we fetch [and change it
3401
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3402
# we fetch here so that we don't process data twice in the common
3403
# case of having something to pull, and so that the check for
3404
# already merged can operate on the just fetched graph, which will
3405
# be cached in memory.
3406
self.fetch(stop_revision=stop_revision)
3407
# Check to see if one is an ancestor of the other
3410
graph = self.target.repository.get_graph()
3411
if self.target._check_if_descendant_or_diverged(
3412
stop_revision, last_rev, graph, self.source):
3413
# stop_revision is a descendant of last_rev, but we aren't
3414
# overwriting, so we're done.
3416
if stop_revno is None:
3418
graph = self.target.repository.get_graph()
3419
this_revno, this_last_revision = \
3420
self.target.last_revision_info()
3421
stop_revno = graph.find_distance_to_null(stop_revision,
3422
[(other_last_revision, other_revno),
3423
(this_last_revision, this_revno)])
3424
self.target.set_last_revision_info(stop_revno, stop_revision)
3427
def pull(self, overwrite=False, stop_revision=None,
3428
possible_transports=None, run_hooks=True,
3429
_override_hook_target=None, local=False):
3430
"""Pull from source into self, updating my master if any.
3432
:param run_hooks: Private parameter - if false, this branch
3433
is being called because it's the master of the primary branch,
3434
so it should not run its hooks.
3436
bound_location = self.target.get_bound_location()
3437
if local and not bound_location:
3438
raise errors.LocalRequiresBoundBranch()
3439
master_branch = None
3440
source_is_master = (self.source.user_url == bound_location)
3441
if not local and bound_location and not source_is_master:
3442
# not pulling from master, so we need to update master.
3443
master_branch = self.target.get_master_branch(possible_transports)
3444
master_branch.lock_write()
3447
# pull from source into master.
3448
master_branch.pull(self.source, overwrite, stop_revision,
3450
return self._pull(overwrite,
3451
stop_revision, _hook_master=master_branch,
3452
run_hooks=run_hooks,
3453
_override_hook_target=_override_hook_target,
3454
merge_tags_to_master=not source_is_master)
3457
master_branch.unlock()
3459
def push(self, overwrite=False, stop_revision=None,
3460
_override_hook_source_branch=None):
3461
"""See InterBranch.push.
3463
This is the basic concrete implementation of push()
3465
:param _override_hook_source_branch: If specified, run
3466
the hooks passing this Branch as the source, rather than self.
3467
This is for use of RemoteBranch, where push is delegated to the
3468
underlying vfs-based Branch.
3470
# TODO: Public option to disable running hooks - should be trivial but
3472
self.source.lock_read()
3474
return _run_with_write_locked_target(
3475
self.target, self._push_with_bound_branches, overwrite,
3477
_override_hook_source_branch=_override_hook_source_branch)
3479
self.source.unlock()
3481
def _push_with_bound_branches(self, overwrite, stop_revision,
3482
_override_hook_source_branch=None):
3483
"""Push from source into target, and into target's master if any.
3486
if _override_hook_source_branch:
3487
result.source_branch = _override_hook_source_branch
3488
for hook in Branch.hooks['post_push']:
3491
bound_location = self.target.get_bound_location()
3492
if bound_location and self.target.base != bound_location:
3493
# there is a master branch.
3495
# XXX: Why the second check? Is it even supported for a branch to
3496
# be bound to itself? -- mbp 20070507
3497
master_branch = self.target.get_master_branch()
3498
master_branch.lock_write()
3500
# push into the master from the source branch.
3501
self.source._basic_push(master_branch, overwrite, stop_revision)
3502
# and push into the target branch from the source. Note that we
3503
# push from the source branch again, because it's considered the
3504
# highest bandwidth repository.
3505
result = self.source._basic_push(self.target, overwrite,
3507
result.master_branch = master_branch
3508
result.local_branch = self.target
3512
master_branch.unlock()
3515
result = self.source._basic_push(self.target, overwrite,
3517
# TODO: Why set master_branch and local_branch if there's no
3518
# binding? Maybe cleaner to just leave them unset? -- mbp
3520
result.master_branch = self.target
3521
result.local_branch = None
3525
def _pull(self, overwrite=False, stop_revision=None,
3526
possible_transports=None, _hook_master=None, run_hooks=True,
3527
_override_hook_target=None, local=False,
3528
merge_tags_to_master=True):
3531
This function is the core worker, used by GenericInterBranch.pull to
3532
avoid duplication when pulling source->master and source->local.
3534
:param _hook_master: Private parameter - set the branch to
3535
be supplied as the master to pull hooks.
3536
:param run_hooks: Private parameter - if false, this branch
3537
is being called because it's the master of the primary branch,
3538
so it should not run its hooks.
3539
is being called because it's the master of the primary branch,
3540
so it should not run its hooks.
3541
:param _override_hook_target: Private parameter - set the branch to be
3542
supplied as the target_branch to pull hooks.
3543
:param local: Only update the local branch, and not the bound branch.
3545
# This type of branch can't be bound.
3547
raise errors.LocalRequiresBoundBranch()
3548
result = PullResult()
3549
result.source_branch = self.source
3550
if _override_hook_target is None:
3551
result.target_branch = self.target
3553
result.target_branch = _override_hook_target
3554
self.source.lock_read()
3556
# We assume that during 'pull' the target repository is closer than
3558
self.source.update_references(self.target)
3559
graph = self.target.repository.get_graph(self.source.repository)
3560
# TODO: Branch formats should have a flag that indicates
3561
# that revno's are expensive, and pull() should honor that flag.
3563
result.old_revno, result.old_revid = \
3564
self.target.last_revision_info()
3565
self.target.update_revisions(self.source, stop_revision,
3566
overwrite=overwrite, graph=graph)
3567
# TODO: The old revid should be specified when merging tags,
3568
# so a tags implementation that versions tags can only
3569
# pull in the most recent changes. -- JRV20090506
3570
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3571
overwrite, ignore_master=not merge_tags_to_master)
3572
result.new_revno, result.new_revid = self.target.last_revision_info()
3574
result.master_branch = _hook_master
3575
result.local_branch = result.target_branch
3577
result.master_branch = result.target_branch
3578
result.local_branch = None
3580
for hook in Branch.hooks['post_pull']:
3583
self.source.unlock()
3587
InterBranch.register_optimiser(GenericInterBranch)
added
removed
bzrlib/branch.py
