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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
18
from cStringIO import StringIO
21
20
from bzrlib.lazy_import import lazy_import
22
21
lazy_import(globals(), """
23
from itertools import chain
22
from copy import deepcopy
23
from unittest import TestSuite
24
from warnings import warn
24
27
from bzrlib import (
27
30
config as _mod_config,
33
35
revision as _mod_revision,
41
from bzrlib.config import BranchConfig, TransportConfig
42
from bzrlib.repofmt.pack_repo import RepositoryFormatKnitPack5RichRoot
41
from bzrlib.config import BranchConfig, TreeConfig
42
from bzrlib.lockable_files import LockableFiles, TransportLock
43
43
from bzrlib.tag import (
49
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
50
from bzrlib.hooks import HookPoint, Hooks
51
from bzrlib.inter import InterObject
52
from bzrlib.lock import _RelockDebugMixin
53
from bzrlib import registry
54
from bzrlib.symbol_versioning import (
58
from bzrlib.trace import mutter, mutter_callsite, note, is_quiet
49
from bzrlib.decorators import needs_read_lock, needs_write_lock
50
from bzrlib.errors import (BzrError, BzrCheckError, DivergedBranches,
51
HistoryMissing, InvalidRevisionId,
52
InvalidRevisionNumber, LockError, NoSuchFile,
53
NoSuchRevision, NoWorkingTree, NotVersionedError,
54
NotBranchError, UninitializableFormat,
55
UnlistableStore, UnlistableBranch,
57
from bzrlib.symbol_versioning import (deprecated_function,
61
zero_eight, zero_nine,
63
from bzrlib.trace import mutter, note
61
66
BZR_BRANCH_FORMAT_4 = "Bazaar-NG branch, format 0.0.4\n"
62
67
BZR_BRANCH_FORMAT_5 = "Bazaar-NG branch, format 5\n"
63
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
66
class Branch(bzrdir.ControlComponent):
68
BZR_BRANCH_FORMAT_6 = "Bazaar-NG branch, format 6\n"
71
# TODO: Maybe include checks for common corruption of newlines, etc?
73
# TODO: Some operations like log might retrieve the same revisions
74
# repeatedly to calculate deltas. We could perhaps have a weakref
75
# cache in memory to make this faster. In general anything can be
76
# cached in memory between lock and unlock operations. .. nb thats
77
# what the transaction identity map provides
80
######################################################################
67
84
"""Branch holding a history of revisions.
70
Base directory/url of the branch; using control_url and
71
control_transport is more standardized.
87
Base directory/url of the branch.
73
89
hooks: An instance of BranchHooks.
121
113
if master is not None:
122
114
master.break_lock()
124
def _check_stackable_repo(self):
125
if not self.repository._format.supports_external_lookups:
126
raise errors.UnstackableRepositoryFormat(self.repository._format,
127
self.repository.base)
129
def _extend_partial_history(self, stop_index=None, stop_revision=None):
130
"""Extend the partial history to include a given index
132
If a stop_index is supplied, stop when that index has been reached.
133
If a stop_revision is supplied, stop when that revision is
134
encountered. Otherwise, stop when the beginning of history is
137
:param stop_index: The index which should be present. When it is
138
present, history extension will stop.
139
:param stop_revision: The revision id which should be present. When
140
it is encountered, history extension will stop.
142
if len(self._partial_revision_history_cache) == 0:
143
self._partial_revision_history_cache = [self.last_revision()]
144
repository._iter_for_revno(
145
self.repository, self._partial_revision_history_cache,
146
stop_index=stop_index, stop_revision=stop_revision)
147
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
148
self._partial_revision_history_cache.pop()
150
def _get_check_refs(self):
151
"""Get the references needed for check().
155
revid = self.last_revision()
156
return [('revision-existence', revid), ('lefthand-distance', revid)]
159
def open(base, _unsupported=False, possible_transports=None):
117
@deprecated_method(zero_eight)
118
def open_downlevel(base):
119
"""Open a branch which may be of an old format."""
120
return Branch.open(base, _unsupported=True)
123
def open(base, _unsupported=False):
160
124
"""Open the branch rooted at base.
162
126
For instance, if the branch is at URL/.bzr/branch,
163
127
Branch.open(URL) -> a Branch instance.
165
control = bzrdir.BzrDir.open(base, _unsupported,
166
possible_transports=possible_transports)
167
return control.open_branch(unsupported=_unsupported)
170
def open_from_transport(transport, name=None, _unsupported=False):
171
"""Open the branch rooted at transport"""
172
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
173
return control.open_branch(name=name, unsupported=_unsupported)
176
def open_containing(url, possible_transports=None):
129
control = bzrdir.BzrDir.open(base, _unsupported)
130
return control.open_branch(_unsupported)
133
def open_containing(url):
177
134
"""Open an existing branch which contains url.
179
136
This probes for a branch at url, and searches upwards from there.
181
138
Basically we keep looking up until we find the control directory or
182
139
run into the root. If there isn't one, raises NotBranchError.
183
If there is one and it is either an unrecognised format or an unsupported
140
If there is one and it is either an unrecognised format or an unsupported
184
141
format, UnknownFormatError or UnsupportedFormatError are raised.
185
142
If there is one, it is returned, along with the unused portion of url.
187
control, relpath = bzrdir.BzrDir.open_containing(url,
144
control, relpath = bzrdir.BzrDir.open_containing(url)
189
145
return control.open_branch(), relpath
191
def _push_should_merge_tags(self):
192
"""Should _basic_push merge this branch's tags into the target?
194
The default implementation returns False if this branch has no tags,
195
and True the rest of the time. Subclasses may override this.
197
return self.supports_tags() and self.tags.get_tag_dict()
148
@deprecated_function(zero_eight)
149
def initialize(base):
150
"""Create a new working tree and branch, rooted at 'base' (url)
152
NOTE: This will soon be deprecated in favour of creation
155
return bzrdir.BzrDir.create_standalone_workingtree(base).branch
157
@deprecated_function(zero_eight)
158
def setup_caching(self, cache_root):
159
"""Subclasses that care about caching should override this, and set
160
up cached stores located under cache_root.
162
NOTE: This is unused.
199
166
def get_config(self):
200
167
return BranchConfig(self)
202
def _get_config(self):
203
"""Get the concrete config for just the config in this branch.
205
This is not intended for client use; see Branch.get_config for the
210
:return: An object supporting get_option and set_option.
212
raise NotImplementedError(self._get_config)
214
def _get_fallback_repository(self, url):
215
"""Get the repository we fallback to at url."""
216
url = urlutils.join(self.base, url)
217
a_branch = Branch.open(url,
218
possible_transports=[self.bzrdir.root_transport])
219
return a_branch.repository
221
def _get_tags_bytes(self):
222
"""Get the bytes of a serialised tags dict.
224
Note that not all branches support tags, nor do all use the same tags
225
logic: this method is specific to BasicTags. Other tag implementations
226
may use the same method name and behave differently, safely, because
227
of the double-dispatch via
228
format.make_tags->tags_instance->get_tags_dict.
230
:return: The bytes of the tags file.
231
:seealso: Branch._set_tags_bytes.
233
return self._transport.get_bytes('tags')
235
def _get_nick(self, local=False, possible_transports=None):
236
config = self.get_config()
237
# explicit overrides master, but don't look for master if local is True
238
if not local and not config.has_explicit_nickname():
240
master = self.get_master_branch(possible_transports)
241
if master is not None:
242
# return the master branch value
244
except errors.BzrError, e:
245
# Silently fall back to local implicit nick if the master is
247
mutter("Could not connect to bound branch, "
248
"falling back to local nick.\n " + str(e))
249
return config.get_nickname()
170
return self.get_config().get_nickname()
251
172
def _set_nick(self, nick):
252
self.get_config().set_user_option('nickname', nick, warn_masked=True)
173
self.get_config().set_user_option('nickname', nick)
254
175
nick = property(_get_nick, _set_nick)
256
177
def is_locked(self):
257
178
raise NotImplementedError(self.is_locked)
259
def _lefthand_history(self, revision_id, last_rev=None,
261
if 'evil' in debug.debug_flags:
262
mutter_callsite(4, "_lefthand_history scales with history.")
263
# stop_revision must be a descendant of last_revision
264
graph = self.repository.get_graph()
265
if last_rev is not None:
266
if not graph.is_ancestor(last_rev, revision_id):
267
# our previous tip is not merged into stop_revision
268
raise errors.DivergedBranches(self, other_branch)
269
# make a new revision history from the graph
270
parents_map = graph.get_parent_map([revision_id])
271
if revision_id not in parents_map:
272
raise errors.NoSuchRevision(self, revision_id)
273
current_rev_id = revision_id
275
check_not_reserved_id = _mod_revision.check_not_reserved_id
276
# Do not include ghosts or graph origin in revision_history
277
while (current_rev_id in parents_map and
278
len(parents_map[current_rev_id]) > 0):
279
check_not_reserved_id(current_rev_id)
280
new_history.append(current_rev_id)
281
current_rev_id = parents_map[current_rev_id][0]
282
parents_map = graph.get_parent_map([current_rev_id])
283
new_history.reverse()
286
def lock_write(self, token=None):
287
"""Lock the branch for write operations.
289
:param token: A token to permit reacquiring a previously held and
291
:return: A BranchWriteLockResult.
180
def lock_write(self):
293
181
raise NotImplementedError(self.lock_write)
295
183
def lock_read(self):
296
"""Lock the branch for read operations.
298
:return: An object with an unlock method which will release the lock
301
184
raise NotImplementedError(self.lock_read)
303
186
def unlock(self):
310
193
def get_physical_lock_status(self):
311
194
raise NotImplementedError(self.get_physical_lock_status)
314
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
315
"""Return the revision_id for a dotted revno.
317
:param revno: a tuple like (1,) or (1,1,2)
318
:param _cache_reverse: a private parameter enabling storage
319
of the reverse mapping in a top level cache. (This should
320
only be done in selective circumstances as we want to
321
avoid having the mapping cached multiple times.)
322
:return: the revision_id
323
:raises errors.NoSuchRevision: if the revno doesn't exist
325
rev_id = self._do_dotted_revno_to_revision_id(revno)
327
self._partial_revision_id_to_revno_cache[rev_id] = revno
330
def _do_dotted_revno_to_revision_id(self, revno):
331
"""Worker function for dotted_revno_to_revision_id.
333
Subclasses should override this if they wish to
334
provide a more efficient implementation.
337
return self.get_rev_id(revno[0])
338
revision_id_to_revno = self.get_revision_id_to_revno_map()
339
revision_ids = [revision_id for revision_id, this_revno
340
in revision_id_to_revno.iteritems()
341
if revno == this_revno]
342
if len(revision_ids) == 1:
343
return revision_ids[0]
345
revno_str = '.'.join(map(str, revno))
346
raise errors.NoSuchRevision(self, revno_str)
349
def revision_id_to_dotted_revno(self, revision_id):
350
"""Given a revision id, return its dotted revno.
352
:return: a tuple like (1,) or (400,1,3).
354
return self._do_revision_id_to_dotted_revno(revision_id)
356
def _do_revision_id_to_dotted_revno(self, revision_id):
357
"""Worker function for revision_id_to_revno."""
358
# Try the caches if they are loaded
359
result = self._partial_revision_id_to_revno_cache.get(revision_id)
360
if result is not None:
362
if self._revision_id_to_revno_cache:
363
result = self._revision_id_to_revno_cache.get(revision_id)
365
raise errors.NoSuchRevision(self, revision_id)
366
# Try the mainline as it's optimised
368
revno = self.revision_id_to_revno(revision_id)
370
except errors.NoSuchRevision:
371
# We need to load and use the full revno map after all
372
result = self.get_revision_id_to_revno_map().get(revision_id)
374
raise errors.NoSuchRevision(self, revision_id)
378
def get_revision_id_to_revno_map(self):
379
"""Return the revision_id => dotted revno map.
381
This will be regenerated on demand, but will be cached.
383
:return: A dictionary mapping revision_id => dotted revno.
384
This dictionary should not be modified by the caller.
386
if self._revision_id_to_revno_cache is not None:
387
mapping = self._revision_id_to_revno_cache
389
mapping = self._gen_revno_map()
390
self._cache_revision_id_to_revno(mapping)
391
# TODO: jam 20070417 Since this is being cached, should we be returning
393
# I would rather not, and instead just declare that users should not
394
# modify the return value.
397
def _gen_revno_map(self):
398
"""Create a new mapping from revision ids to dotted revnos.
400
Dotted revnos are generated based on the current tip in the revision
402
This is the worker function for get_revision_id_to_revno_map, which
403
just caches the return value.
405
:return: A dictionary mapping revision_id => dotted revno.
407
revision_id_to_revno = dict((rev_id, revno)
408
for rev_id, depth, revno, end_of_merge
409
in self.iter_merge_sorted_revisions())
410
return revision_id_to_revno
413
def iter_merge_sorted_revisions(self, start_revision_id=None,
414
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
415
"""Walk the revisions for a branch in merge sorted order.
417
Merge sorted order is the output from a merge-aware,
418
topological sort, i.e. all parents come before their
419
children going forward; the opposite for reverse.
421
:param start_revision_id: the revision_id to begin walking from.
422
If None, the branch tip is used.
423
:param stop_revision_id: the revision_id to terminate the walk
424
after. If None, the rest of history is included.
425
:param stop_rule: if stop_revision_id is not None, the precise rule
426
to use for termination:
427
* 'exclude' - leave the stop revision out of the result (default)
428
* 'include' - the stop revision is the last item in the result
429
* 'with-merges' - include the stop revision and all of its
430
merged revisions in the result
431
* 'with-merges-without-common-ancestry' - filter out revisions
432
that are in both ancestries
433
:param direction: either 'reverse' or 'forward':
434
* reverse means return the start_revision_id first, i.e.
435
start at the most recent revision and go backwards in history
436
* forward returns tuples in the opposite order to reverse.
437
Note in particular that forward does *not* do any intelligent
438
ordering w.r.t. depth as some clients of this API may like.
439
(If required, that ought to be done at higher layers.)
441
:return: an iterator over (revision_id, depth, revno, end_of_merge)
444
* revision_id: the unique id of the revision
445
* depth: How many levels of merging deep this node has been
447
* revno_sequence: This field provides a sequence of
448
revision numbers for all revisions. The format is:
449
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
450
branch that the revno is on. From left to right the REVNO numbers
451
are the sequence numbers within that branch of the revision.
452
* end_of_merge: When True the next node (earlier in history) is
453
part of a different merge.
455
# Note: depth and revno values are in the context of the branch so
456
# we need the full graph to get stable numbers, regardless of the
458
if self._merge_sorted_revisions_cache is None:
459
last_revision = self.last_revision()
460
known_graph = self.repository.get_known_graph_ancestry(
462
self._merge_sorted_revisions_cache = known_graph.merge_sort(
464
filtered = self._filter_merge_sorted_revisions(
465
self._merge_sorted_revisions_cache, start_revision_id,
466
stop_revision_id, stop_rule)
467
# Make sure we don't return revisions that are not part of the
468
# start_revision_id ancestry.
469
filtered = self._filter_start_non_ancestors(filtered)
470
if direction == 'reverse':
472
if direction == 'forward':
473
return reversed(list(filtered))
475
raise ValueError('invalid direction %r' % direction)
477
def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
478
start_revision_id, stop_revision_id, stop_rule):
479
"""Iterate over an inclusive range of sorted revisions."""
480
rev_iter = iter(merge_sorted_revisions)
481
if start_revision_id is not None:
482
for node in rev_iter:
483
rev_id = node.key[-1]
484
if rev_id != start_revision_id:
487
# The decision to include the start or not
488
# depends on the stop_rule if a stop is provided
489
# so pop this node back into the iterator
490
rev_iter = chain(iter([node]), rev_iter)
492
if stop_revision_id is None:
494
for node in rev_iter:
495
rev_id = node.key[-1]
496
yield (rev_id, node.merge_depth, node.revno,
498
elif stop_rule == 'exclude':
499
for node in rev_iter:
500
rev_id = node.key[-1]
501
if rev_id == stop_revision_id:
503
yield (rev_id, node.merge_depth, node.revno,
505
elif stop_rule == 'include':
506
for node in rev_iter:
507
rev_id = node.key[-1]
508
yield (rev_id, node.merge_depth, node.revno,
510
if rev_id == stop_revision_id:
512
elif stop_rule == 'with-merges-without-common-ancestry':
513
# We want to exclude all revisions that are already part of the
514
# stop_revision_id ancestry.
515
graph = self.repository.get_graph()
516
ancestors = graph.find_unique_ancestors(start_revision_id,
518
for node in rev_iter:
519
rev_id = node.key[-1]
520
if rev_id not in ancestors:
522
yield (rev_id, node.merge_depth, node.revno,
524
elif stop_rule == 'with-merges':
525
stop_rev = self.repository.get_revision(stop_revision_id)
526
if stop_rev.parent_ids:
527
left_parent = stop_rev.parent_ids[0]
529
left_parent = _mod_revision.NULL_REVISION
530
# left_parent is the actual revision we want to stop logging at,
531
# since we want to show the merged revisions after the stop_rev too
532
reached_stop_revision_id = False
533
revision_id_whitelist = []
534
for node in rev_iter:
535
rev_id = node.key[-1]
536
if rev_id == left_parent:
537
# reached the left parent after the stop_revision
539
if (not reached_stop_revision_id or
540
rev_id in revision_id_whitelist):
541
yield (rev_id, node.merge_depth, node.revno,
543
if reached_stop_revision_id or rev_id == stop_revision_id:
544
# only do the merged revs of rev_id from now on
545
rev = self.repository.get_revision(rev_id)
547
reached_stop_revision_id = True
548
revision_id_whitelist.extend(rev.parent_ids)
550
raise ValueError('invalid stop_rule %r' % stop_rule)
552
def _filter_start_non_ancestors(self, rev_iter):
553
# If we started from a dotted revno, we want to consider it as a tip
554
# and don't want to yield revisions that are not part of its
555
# ancestry. Given the order guaranteed by the merge sort, we will see
556
# uninteresting descendants of the first parent of our tip before the
558
first = rev_iter.next()
559
(rev_id, merge_depth, revno, end_of_merge) = first
562
# We start at a mainline revision so by definition, all others
563
# revisions in rev_iter are ancestors
564
for node in rev_iter:
569
pmap = self.repository.get_parent_map([rev_id])
570
parents = pmap.get(rev_id, [])
572
whitelist.update(parents)
574
# If there is no parents, there is nothing of interest left
576
# FIXME: It's hard to test this scenario here as this code is never
577
# called in that case. -- vila 20100322
580
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
582
if rev_id in whitelist:
583
pmap = self.repository.get_parent_map([rev_id])
584
parents = pmap.get(rev_id, [])
585
whitelist.remove(rev_id)
586
whitelist.update(parents)
588
# We've reached the mainline, there is nothing left to
592
# A revision that is not part of the ancestry of our
595
yield (rev_id, merge_depth, revno, end_of_merge)
597
def leave_lock_in_place(self):
598
"""Tell this branch object not to release the physical lock when this
601
If lock_write doesn't return a token, then this method is not supported.
603
self.control_files.leave_in_place()
605
def dont_leave_lock_in_place(self):
606
"""Tell this branch object to release the physical lock when this
607
object is unlocked, even if it didn't originally acquire it.
609
If lock_write doesn't return a token, then this method is not supported.
611
self.control_files.dont_leave_in_place()
196
def abspath(self, name):
197
"""Return absolute filename for something in the branch
199
XXX: Robert Collins 20051017 what is this used for? why is it a branch
200
method and not a tree method.
202
raise NotImplementedError(self.abspath)
613
204
def bind(self, other):
614
205
"""Bind the local branch the other branch.
709
290
The delta is relative to its mainline predecessor, or the
710
291
empty tree for revision 1.
293
assert isinstance(revno, int)
712
294
rh = self.revision_history()
713
295
if not (1 <= revno <= len(rh)):
714
raise errors.InvalidRevisionNumber(revno)
296
raise InvalidRevisionNumber(revno)
715
297
return self.repository.get_revision_delta(rh[revno-1])
717
def get_stacked_on_url(self):
718
"""Get the URL this branch is stacked against.
720
:raises NotStacked: If the branch is not stacked.
721
:raises UnstackableBranchFormat: If the branch does not support
724
raise NotImplementedError(self.get_stacked_on_url)
299
def get_root_id(self):
300
"""Return the id of this branches root"""
301
raise NotImplementedError(self.get_root_id)
726
303
def print_file(self, file, revision_id):
727
304
"""Print `file` to stdout."""
728
305
raise NotImplementedError(self.print_file)
307
def append_revision(self, *revision_ids):
308
raise NotImplementedError(self.append_revision)
730
310
def set_revision_history(self, rev_history):
731
311
raise NotImplementedError(self.set_revision_history)
734
def set_parent(self, url):
735
"""See Branch.set_parent."""
736
# TODO: Maybe delete old location files?
737
# URLs should never be unicode, even on the local fs,
738
# FIXUP this and get_parent in a future branch format bump:
739
# read and rewrite the file. RBC 20060125
741
if isinstance(url, unicode):
743
url = url.encode('ascii')
744
except UnicodeEncodeError:
745
raise errors.InvalidURL(url,
746
"Urls must be 7-bit ascii, "
747
"use bzrlib.urlutils.escape")
748
url = urlutils.relative_url(self.base, url)
749
self._set_parent_location(url)
752
def set_stacked_on_url(self, url):
753
"""Set the URL this branch is stacked against.
755
:raises UnstackableBranchFormat: If the branch does not support
757
:raises UnstackableRepositoryFormat: If the repository does not support
760
if not self._format.supports_stacking():
761
raise errors.UnstackableBranchFormat(self._format, self.user_url)
762
# XXX: Changing from one fallback repository to another does not check
763
# that all the data you need is present in the new fallback.
764
# Possibly it should.
765
self._check_stackable_repo()
768
old_url = self.get_stacked_on_url()
769
except (errors.NotStacked, errors.UnstackableBranchFormat,
770
errors.UnstackableRepositoryFormat):
774
self._activate_fallback_location(url)
775
# write this out after the repository is stacked to avoid setting a
776
# stacked config that doesn't work.
777
self._set_config_location('stacked_on_location', url)
780
"""Change a branch to be unstacked, copying data as needed.
782
Don't call this directly, use set_stacked_on_url(None).
784
pb = ui.ui_factory.nested_progress_bar()
786
pb.update("Unstacking")
787
# The basic approach here is to fetch the tip of the branch,
788
# including all available ghosts, from the existing stacked
789
# repository into a new repository object without the fallbacks.
791
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
792
# correct for CHKMap repostiories
793
old_repository = self.repository
794
if len(old_repository._fallback_repositories) != 1:
795
raise AssertionError("can't cope with fallback repositories "
796
"of %r" % (self.repository,))
797
# unlock it, including unlocking the fallback
798
old_repository.unlock()
799
old_repository.lock_read()
801
# Repositories don't offer an interface to remove fallback
802
# repositories today; take the conceptually simpler option and just
803
# reopen it. We reopen it starting from the URL so that we
804
# get a separate connection for RemoteRepositories and can
805
# stream from one of them to the other. This does mean doing
806
# separate SSH connection setup, but unstacking is not a
807
# common operation so it's tolerable.
808
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
809
new_repository = new_bzrdir.find_repository()
810
self.repository = new_repository
811
if self.repository._fallback_repositories:
812
raise AssertionError("didn't expect %r to have "
813
"fallback_repositories"
814
% (self.repository,))
815
# this is not paired with an unlock because it's just restoring
816
# the previous state; the lock's released when set_stacked_on_url
818
self.repository.lock_write()
819
# XXX: If you unstack a branch while it has a working tree
820
# with a pending merge, the pending-merged revisions will no
821
# longer be present. You can (probably) revert and remerge.
823
# XXX: This only fetches up to the tip of the repository; it
824
# doesn't bring across any tags. That's fairly consistent
825
# with how branch works, but perhaps not ideal.
826
self.repository.fetch(old_repository,
827
revision_id=self.last_revision(),
830
old_repository.unlock()
834
def _set_tags_bytes(self, bytes):
835
"""Mirror method for _get_tags_bytes.
837
:seealso: Branch._get_tags_bytes.
839
return _run_with_write_locked_target(self, self._transport.put_bytes,
842
def _cache_revision_history(self, rev_history):
843
"""Set the cached revision history to rev_history.
845
The revision_history method will use this cache to avoid regenerating
846
the revision history.
848
This API is semi-public; it only for use by subclasses, all other code
849
should consider it to be private.
851
self._revision_history_cache = rev_history
853
def _cache_revision_id_to_revno(self, revision_id_to_revno):
854
"""Set the cached revision_id => revno map to revision_id_to_revno.
856
This API is semi-public; it only for use by subclasses, all other code
857
should consider it to be private.
859
self._revision_id_to_revno_cache = revision_id_to_revno
861
def _clear_cached_state(self):
862
"""Clear any cached data on this branch, e.g. cached revision history.
864
This means the next call to revision_history will need to call
865
_gen_revision_history.
867
This API is semi-public; it only for use by subclasses, all other code
868
should consider it to be private.
870
self._revision_history_cache = None
871
self._revision_id_to_revno_cache = None
872
self._last_revision_info_cache = None
873
self._merge_sorted_revisions_cache = None
874
self._partial_revision_history_cache = []
875
self._partial_revision_id_to_revno_cache = {}
877
def _gen_revision_history(self):
878
"""Return sequence of revision hashes on to this branch.
880
Unlike revision_history, this method always regenerates or rereads the
881
revision history, i.e. it does not cache the result, so repeated calls
884
Concrete subclasses should override this instead of revision_history so
885
that subclasses do not need to deal with caching logic.
887
This API is semi-public; it only for use by subclasses, all other code
888
should consider it to be private.
890
raise NotImplementedError(self._gen_revision_history)
893
313
def revision_history(self):
894
"""Return sequence of revision ids on this branch.
896
This method will cache the revision history for as long as it is safe to
899
if 'evil' in debug.debug_flags:
900
mutter_callsite(3, "revision_history scales with history.")
901
if self._revision_history_cache is not None:
902
history = self._revision_history_cache
904
history = self._gen_revision_history()
905
self._cache_revision_history(history)
314
"""Return sequence of revision hashes on to this branch."""
315
raise NotImplementedError(self.revision_history)
909
318
"""Return current revision number for this branch.
953
363
common_index = min(self_len, other_len) -1
954
364
if common_index >= 0 and \
955
365
self_history[common_index] != other_history[common_index]:
956
raise errors.DivergedBranches(self, other)
366
raise DivergedBranches(self, other)
958
368
if stop_revision is None:
959
369
stop_revision = other_len
371
assert isinstance(stop_revision, int)
961
372
if stop_revision > other_len:
962
373
raise errors.NoSuchRevision(self, stop_revision)
963
374
return other_history[self_len:stop_revision]
966
def update_revisions(self, other, stop_revision=None, overwrite=False,
376
def update_revisions(self, other, stop_revision=None):
968
377
"""Pull in new perfect-fit revisions.
970
379
:param other: Another Branch to pull from
971
380
:param stop_revision: Updated until the given revision
972
:param overwrite: Always set the branch pointer, rather than checking
973
to see if it is a proper descendant.
974
:param graph: A Graph object that can be used to query history
975
information. This can be None.
978
return InterBranch.get(other, self).update_revisions(stop_revision,
981
def import_last_revision_info(self, source_repo, revno, revid):
982
"""Set the last revision info, importing from another repo if necessary.
984
This is used by the bound branch code to upload a revision to
985
the master branch first before updating the tip of the local branch.
987
:param source_repo: Source repository to optionally fetch from
988
:param revno: Revision number of the new tip
989
:param revid: Revision id of the new tip
991
if not self.repository.has_same_location(source_repo):
992
self.repository.fetch(source_repo, revision_id=revid)
993
self.set_last_revision_info(revno, revid)
383
raise NotImplementedError(self.update_revisions)
995
385
def revision_id_to_revno(self, revision_id):
996
386
"""Given a revision id, return its revno"""
997
if _mod_revision.is_null(revision_id):
387
if revision_id is None:
389
revision_id = osutils.safe_revision_id(revision_id)
999
390
history = self.revision_history()
1001
392
return history.index(revision_id) + 1
1002
393
except ValueError:
1003
raise errors.NoSuchRevision(self, revision_id)
394
raise bzrlib.errors.NoSuchRevision(self, revision_id)
1006
396
def get_rev_id(self, revno, history=None):
1007
397
"""Find the revision id of the specified revno."""
1009
return _mod_revision.NULL_REVISION
1010
last_revno, last_revid = self.last_revision_info()
1011
if revno == last_revno:
1013
if revno <= 0 or revno > last_revno:
1014
raise errors.NoSuchRevision(self, revno)
1015
distance_from_last = last_revno - revno
1016
if len(self._partial_revision_history_cache) <= distance_from_last:
1017
self._extend_partial_history(distance_from_last)
1018
return self._partial_revision_history_cache[distance_from_last]
401
history = self.revision_history()
402
if revno <= 0 or revno > len(history):
403
raise bzrlib.errors.NoSuchRevision(self, revno)
404
return history[revno - 1]
1021
def pull(self, source, overwrite=False, stop_revision=None,
1022
possible_transports=None, *args, **kwargs):
406
def pull(self, source, overwrite=False, stop_revision=None):
1023
407
"""Mirror source into this branch.
1025
409
This branch is considered to be 'local', having low latency.
1027
411
:returns: PullResult instance
1029
return InterBranch.get(source, self).pull(overwrite=overwrite,
1030
stop_revision=stop_revision,
1031
possible_transports=possible_transports, *args, **kwargs)
413
raise NotImplementedError(self.pull)
1033
def push(self, target, overwrite=False, stop_revision=None, *args,
415
def push(self, target, overwrite=False, stop_revision=None):
1035
416
"""Mirror this branch into target.
1037
418
This branch is considered to be 'local', having low latency.
1039
return InterBranch.get(self, target).push(overwrite, stop_revision,
1042
def lossy_push(self, target, stop_revision=None):
1043
"""Push deltas into another branch.
1045
:note: This does not, like push, retain the revision ids from
1046
the source branch and will, rather than adding bzr-specific
1047
metadata, push only those semantics of the revision that can be
1048
natively represented by this branch' VCS.
1050
:param target: Target branch
1051
:param stop_revision: Revision to push, defaults to last revision.
1052
:return: BranchPushResult with an extra member revidmap:
1053
A dictionary mapping revision ids from the target branch
1054
to new revision ids in the target branch, for each
1055
revision that was pushed.
1057
inter = InterBranch.get(self, target)
1058
lossy_push = getattr(inter, "lossy_push", None)
1059
if lossy_push is None:
1060
raise errors.LossyPushToSameVCS(self, target)
1061
return lossy_push(stop_revision)
420
raise NotImplementedError(self.push)
1063
422
def basis_tree(self):
1064
423
"""Return `Tree` object for last revision."""
1065
424
return self.repository.revision_tree(self.last_revision())
426
def rename_one(self, from_rel, to_rel):
429
This can change the directory or the filename or both.
431
raise NotImplementedError(self.rename_one)
433
def move(self, from_paths, to_name):
436
to_name must exist as a versioned directory.
438
If to_name exists and is a directory, the files are moved into
439
it, keeping their old names. If it is a directory,
441
Note that to_name is only the last component of the new name;
442
this doesn't change the directory.
444
This returns a list of (from_path, to_path) pairs for each
447
raise NotImplementedError(self.move)
1067
449
def get_parent(self):
1068
450
"""Return the parent location of the branch.
1070
This is the default location for pull/missing. The usual
452
This is the default location for push/pull/missing. The usual
1071
453
pattern is that the user can override it by specifying a
1074
parent = self._get_parent_location()
1077
# This is an old-format absolute path to a local branch
1078
# turn it into a url
1079
if parent.startswith('/'):
1080
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1082
return urlutils.join(self.base[:-1], parent)
1083
except errors.InvalidURLJoin, e:
1084
raise errors.InaccessibleParent(parent, self.user_url)
1086
def _get_parent_location(self):
1087
raise NotImplementedError(self._get_parent_location)
1089
def _set_config_location(self, name, url, config=None,
1090
make_relative=False):
1092
config = self.get_config()
1096
url = urlutils.relative_url(self.base, url)
1097
config.set_user_option(name, url, warn_masked=True)
1099
def _get_config_location(self, name, config=None):
1101
config = self.get_config()
1102
location = config.get_user_option(name)
1107
def get_child_submit_format(self):
1108
"""Return the preferred format of submissions to this branch."""
1109
return self.get_config().get_user_option("child_submit_format")
456
raise NotImplementedError(self.get_parent)
1111
458
def get_submit_branch(self):
1112
459
"""Return the submit location of the branch.
1191
501
self.check_real_revno(revno)
1193
503
def check_real_revno(self, revno):
1195
505
Check whether a revno corresponds to a real revision.
1196
506
Zero (the NULL revision) is considered invalid
1198
508
if revno < 1 or revno > self.revno():
1199
raise errors.InvalidRevisionNumber(revno)
509
raise InvalidRevisionNumber(revno)
1201
511
@needs_read_lock
1202
def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
512
def clone(self, *args, **kwargs):
1203
513
"""Clone this branch into to_bzrdir preserving all semantic values.
1205
Most API users will want 'create_clone_on_transport', which creates a
1206
new bzrdir and branch on the fly.
1208
515
revision_id: if not None, the revision history in the new branch will
1209
516
be truncated to end with revision_id.
1211
result = to_bzrdir.create_branch()
1214
if repository_policy is not None:
1215
repository_policy.configure_branch(result)
1216
self.copy_content_into(result, revision_id=revision_id)
518
# for API compatibility, until 0.8 releases we provide the old api:
519
# def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
520
# after 0.8 releases, the *args and **kwargs should be changed:
521
# def clone(self, to_bzrdir, revision_id=None):
522
if (kwargs.get('to_location', None) or
523
kwargs.get('revision', None) or
524
kwargs.get('basis_branch', None) or
525
(len(args) and isinstance(args[0], basestring))):
526
# backwards compatibility api:
527
warn("Branch.clone() has been deprecated for BzrDir.clone() from"
528
" bzrlib 0.8.", DeprecationWarning, stacklevel=3)
531
basis_branch = args[2]
533
basis_branch = kwargs.get('basis_branch', None)
535
basis = basis_branch.bzrdir
540
revision_id = args[1]
542
revision_id = kwargs.get('revision', None)
547
# no default to raise if not provided.
548
url = kwargs.get('to_location')
549
return self.bzrdir.clone(url,
550
revision_id=revision_id,
551
basis=basis).open_branch()
553
# generate args by hand
555
revision_id = args[1]
557
revision_id = kwargs.get('revision_id', None)
561
# no default to raise if not provided.
562
to_bzrdir = kwargs.get('to_bzrdir')
563
result = self._format.initialize(to_bzrdir)
564
self.copy_content_into(result, revision_id=revision_id)
1221
567
@needs_read_lock
1222
def sprout(self, to_bzrdir, revision_id=None, repository_policy=None):
568
def sprout(self, to_bzrdir, revision_id=None):
1223
569
"""Create a new line of development from the branch, into to_bzrdir.
1225
to_bzrdir controls the branch format.
1227
571
revision_id: if not None, the revision history in the new branch will
1228
572
be truncated to end with revision_id.
1230
if (repository_policy is not None and
1231
repository_policy.requires_stacking()):
1232
to_bzrdir._format.require_stacking(_skip_repo=True)
1233
result = to_bzrdir.create_branch()
1236
if repository_policy is not None:
1237
repository_policy.configure_branch(result)
1238
self.copy_content_into(result, revision_id=revision_id)
1239
result.set_parent(self.bzrdir.root_transport.base)
574
result = self._format.initialize(to_bzrdir)
575
self.copy_content_into(result, revision_id=revision_id)
576
result.set_parent(self.bzrdir.root_transport.base)
1244
579
def _synchronize_history(self, destination, revision_id):
1245
580
"""Synchronize last revision and revision history between branches.
1247
582
This version is most efficient when the destination is also a
1248
BzrBranch6, but works for BzrBranch5, as long as the destination's
1249
repository contains all the lefthand ancestors of the intended
1250
last_revision. If not, set_last_revision_info will fail.
583
BzrBranch5, but works for BzrBranch6 as long as the revision
584
history is the true lefthand parent history, and all of the revisions
585
are in the destination's repository. If not, set_revision_history
1252
588
:param destination: The branch to copy the history into
1253
589
:param revision_id: The revision-id to truncate history at. May
1254
590
be None to copy complete history.
1256
source_revno, source_revision_id = self.last_revision_info()
1257
if revision_id is None:
1258
revno, revision_id = source_revno, source_revision_id
1260
graph = self.repository.get_graph()
592
new_history = self.revision_history()
593
if revision_id is not None:
594
revision_id = osutils.safe_revision_id(revision_id)
1262
revno = graph.find_distance_to_null(revision_id,
1263
[(source_revision_id, source_revno)])
1264
except errors.GhostRevisionsHaveNoRevno:
1265
# Default to 1, if we can't find anything else
1267
destination.set_last_revision_info(revno, revision_id)
596
new_history = new_history[:new_history.index(revision_id) + 1]
598
rev = self.repository.get_revision(revision_id)
599
new_history = rev.get_history(self.repository)[1:]
600
destination.set_revision_history(new_history)
1269
602
@needs_read_lock
1270
603
def copy_content_into(self, destination, revision_id=None):
1284
616
destination.set_parent(parent)
1285
if self._push_should_merge_tags():
1286
self.tags.merge_to(destination.tags)
1288
def update_references(self, target):
1289
if not getattr(self._format, 'supports_reference_locations', False):
1291
reference_dict = self._get_all_reference_info()
1292
if len(reference_dict) == 0:
1294
old_base = self.base
1295
new_base = target.base
1296
target_reference_dict = target._get_all_reference_info()
1297
for file_id, (tree_path, branch_location) in (
1298
reference_dict.items()):
1299
branch_location = urlutils.rebase_url(branch_location,
1301
target_reference_dict.setdefault(
1302
file_id, (tree_path, branch_location))
1303
target._set_all_reference_info(target_reference_dict)
1305
618
@needs_read_lock
1306
def check(self, refs):
1307
620
"""Check consistency of the branch.
1309
622
In particular this checks that revisions given in the revision-history
1310
do actually match up in the revision graph, and that they're all
623
do actually match up in the revision graph, and that they're all
1311
624
present in the repository.
1313
626
Callers will typically also want to check the repository.
1315
:param refs: Calculated refs for this branch as specified by
1316
branch._get_check_refs()
1317
628
:return: A BranchCheckResult.
1319
result = BranchCheckResult(self)
1320
last_revno, last_revision_id = self.last_revision_info()
1321
actual_revno = refs[('lefthand-distance', last_revision_id)]
1322
if actual_revno != last_revno:
1323
result.errors.append(errors.BzrCheckError(
1324
'revno does not match len(mainline) %s != %s' % (
1325
last_revno, actual_revno)))
1326
# TODO: We should probably also check that self.revision_history
1327
# matches the repository for older branch formats.
1328
# If looking for the code that cross-checks repository parents against
1329
# the iter_reverse_revision_history output, that is now a repository
630
mainline_parent_id = None
631
for revision_id in self.revision_history():
633
revision = self.repository.get_revision(revision_id)
634
except errors.NoSuchRevision, e:
635
raise errors.BzrCheckError("mainline revision {%s} not in repository"
637
# In general the first entry on the revision history has no parents.
638
# But it's not illegal for it to have parents listed; this can happen
639
# in imports from Arch when the parents weren't reachable.
640
if mainline_parent_id is not None:
641
if mainline_parent_id not in revision.parent_ids:
642
raise errors.BzrCheckError("previous revision {%s} not listed among "
644
% (mainline_parent_id, revision_id))
645
mainline_parent_id = revision_id
646
return BranchCheckResult(self)
1333
648
def _get_checkout_format(self):
1334
649
"""Return the most suitable metadir for a checkout of this branch.
1335
Weaves are used if this branch's repository uses weaves.
650
Weaves are used if this branch's repostory uses weaves.
1337
652
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
1338
653
from bzrlib.repofmt import weaverepo
1339
654
format = bzrdir.BzrDirMetaFormat1()
1340
655
format.repository_format = weaverepo.RepositoryFormat7()
1342
format = self.repository.bzrdir.checkout_metadir()
1343
format.set_branch_format(self._format)
657
format = self.repository.bzrdir.cloning_metadir()
658
format.branch_format = self._format
1346
def create_clone_on_transport(self, to_transport, revision_id=None,
1347
stacked_on=None, create_prefix=False, use_existing_dir=False):
1348
"""Create a clone of this branch and its bzrdir.
1350
:param to_transport: The transport to clone onto.
1351
:param revision_id: The revision id to use as tip in the new branch.
1352
If None the tip is obtained from this branch.
1353
:param stacked_on: An optional URL to stack the clone on.
1354
:param create_prefix: Create any missing directories leading up to
1356
:param use_existing_dir: Use an existing directory if one exists.
1358
# XXX: Fix the bzrdir API to allow getting the branch back from the
1359
# clone call. Or something. 20090224 RBC/spiv.
1360
if revision_id is None:
1361
revision_id = self.last_revision()
1362
dir_to = self.bzrdir.clone_on_transport(to_transport,
1363
revision_id=revision_id, stacked_on=stacked_on,
1364
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
1365
return dir_to.open_branch()
1367
661
def create_checkout(self, to_location, revision_id=None,
1368
lightweight=False, accelerator_tree=None,
1370
663
"""Create a checkout of a branch.
1372
665
:param to_location: The url to produce the checkout at
1373
666
:param revision_id: The revision to check out
1374
667
:param lightweight: If True, produce a lightweight checkout, otherwise,
1375
668
produce a bound branch (heavyweight checkout)
1376
:param accelerator_tree: A tree which can be used for retrieving file
1377
contents more quickly than the revision tree, i.e. a workingtree.
1378
The revision tree will be used for cases where accelerator_tree's
1379
content is different.
1380
:param hardlink: If true, hard-link files from accelerator_tree,
1382
669
:return: The tree of the created checkout
1384
671
t = transport.get_transport(to_location)
674
except errors.FileExists:
1387
format = self._get_checkout_format()
1388
checkout = format.initialize_on_transport(t)
1389
from_branch = BranchReferenceFormat().initialize(checkout,
677
checkout = bzrdir.BzrDirMetaFormat1().initialize_on_transport(t)
678
BranchReferenceFormat().initialize(checkout, self)
1392
680
format = self._get_checkout_format()
1393
681
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1394
682
to_location, force_new_tree=False, format=format)
1395
683
checkout = checkout_branch.bzrdir
1396
684
checkout_branch.bind(self)
1397
# pull up to the specified revision_id to set the initial
685
# pull up to the specified revision_id to set the initial
1398
686
# branch tip correctly, and seed it with history.
1399
687
checkout_branch.pull(self, stop_revision=revision_id)
1401
tree = checkout.create_workingtree(revision_id,
1402
from_branch=from_branch,
1403
accelerator_tree=accelerator_tree,
1405
basis_tree = tree.basis_tree()
1406
basis_tree.lock_read()
1408
for path, file_id in basis_tree.iter_references():
1409
reference_parent = self.reference_parent(file_id, path)
1410
reference_parent.create_checkout(tree.abspath(path),
1411
basis_tree.get_reference_revision(file_id, path),
1418
def reconcile(self, thorough=True):
1419
"""Make sure the data stored in this branch is consistent."""
1420
from bzrlib.reconcile import BranchReconciler
1421
reconciler = BranchReconciler(self, thorough=thorough)
1422
reconciler.reconcile()
1425
def reference_parent(self, file_id, path, possible_transports=None):
1426
"""Return the parent branch for a tree-reference file_id
1427
:param file_id: The file_id of the tree reference
1428
:param path: The path of the file_id in the tree
1429
:return: A branch associated with the file_id
1431
# FIXME should provide multiple branches, based on config
1432
return Branch.open(self.bzrdir.root_transport.clone(path).base,
1433
possible_transports=possible_transports)
688
return checkout.create_workingtree(revision_id)
1435
690
def supports_tags(self):
1436
691
return self._format.supports_tags()
1438
def automatic_tag_name(self, revision_id):
1439
"""Try to automatically find the tag name for a revision.
1441
:param revision_id: Revision id of the revision.
1442
:return: A tag name or None if no tag name could be determined.
1444
for hook in Branch.hooks['automatic_tag_name']:
1445
ret = hook(self, revision_id)
1450
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1452
"""Ensure that revision_b is a descendant of revision_a.
1454
This is a helper function for update_revisions.
1456
:raises: DivergedBranches if revision_b has diverged from revision_a.
1457
:returns: True if revision_b is a descendant of revision_a.
1459
relation = self._revision_relations(revision_a, revision_b, graph)
1460
if relation == 'b_descends_from_a':
1462
elif relation == 'diverged':
1463
raise errors.DivergedBranches(self, other_branch)
1464
elif relation == 'a_descends_from_b':
1467
raise AssertionError("invalid relation: %r" % (relation,))
1469
def _revision_relations(self, revision_a, revision_b, graph):
1470
"""Determine the relationship between two revisions.
1472
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1474
heads = graph.heads([revision_a, revision_b])
1475
if heads == set([revision_b]):
1476
return 'b_descends_from_a'
1477
elif heads == set([revision_a, revision_b]):
1478
# These branches have diverged
1480
elif heads == set([revision_a]):
1481
return 'a_descends_from_b'
1483
raise AssertionError("invalid heads: %r" % (heads,))
1486
694
class BranchFormat(object):
1487
695
"""An encapsulation of the initialization and open routines for a format.
1596
762
control_files = lockable_files.LockableFiles(branch_transport,
1597
763
lock_name, lock_class)
1598
764
control_files.create_lock()
1600
control_files.lock_write()
1601
except errors.LockContention:
1602
if lock_type != 'branch4':
765
control_files.lock_write()
1608
utf8_files += [('format', self.get_format_string())]
767
control_files.put_utf8('format', self.get_format_string())
1610
for (filename, content) in utf8_files:
1611
branch_transport.put_bytes(
1613
mode=a_bzrdir._get_file_mode())
769
for file, content in utf8_files:
770
control_files.put_utf8(file, content)
1616
control_files.unlock()
1617
branch = self.open(a_bzrdir, name, _found=True)
1618
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
772
control_files.unlock()
773
return self.open(a_bzrdir, _found=True)
1621
def initialize(self, a_bzrdir, name=None):
1622
"""Create a branch of this format in a_bzrdir.
1624
:param name: Name of the colocated branch to create.
775
def initialize(self, a_bzrdir):
776
"""Create a branch of this format in a_bzrdir."""
1626
777
raise NotImplementedError(self.initialize)
1628
779
def is_supported(self):
1629
780
"""Is this format supported?
1631
782
Supported formats can be initialized and opened.
1632
Unsupported formats may not support initialization or committing or
783
Unsupported formats may not support initialization or committing or
1633
784
some other features depending on the reason for not being supported.
1637
def make_tags(self, branch):
1638
"""Create a tags object for branch.
1640
This method is on BranchFormat, because BranchFormats are reflected
1641
over the wire via network_name(), whereas full Branch instances require
1642
multiple VFS method calls to operate at all.
1644
The default implementation returns a disabled-tags instance.
1646
Note that it is normal for branch to be a RemoteBranch when using tags
1649
return DisabledTags(branch)
1651
def network_name(self):
1652
"""A simple byte string uniquely identifying this format for RPC calls.
1654
MetaDir branch formats use their disk format string to identify the
1655
repository over the wire. All in one formats such as bzr < 0.8, and
1656
foreign formats like svn/git and hg should use some marker which is
1657
unique and immutable.
1659
raise NotImplementedError(self.network_name)
1661
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
788
def open(self, a_bzrdir, _found=False):
1662
789
"""Return the branch object for a_bzrdir
1664
:param a_bzrdir: A BzrDir that contains a branch.
1665
:param name: Name of colocated branch to open
1666
:param _found: a private parameter, do not use it. It is used to
1667
indicate if format probing has already be done.
1668
:param ignore_fallbacks: when set, no fallback branches will be opened
1669
(if there are any). Default is to open fallbacks.
791
_found is a private parameter, do not use it. It is used to indicate
792
if format probing has already be done.
1671
794
raise NotImplementedError(self.open)
1674
797
def register_format(klass, format):
1675
"""Register a metadir format."""
1676
798
klass._formats[format.get_format_string()] = format
1677
# Metadir formats have a network name of their format string, and get
1678
# registered as class factories.
1679
network_format_registry.register(format.get_format_string(), format.__class__)
1682
801
def set_default_format(klass, format):
1683
802
klass._default_format = format
1685
def supports_set_append_revisions_only(self):
1686
"""True if this format supports set_append_revisions_only."""
1689
def supports_stacking(self):
1690
"""True if this format records a stacked-on branch."""
1694
805
def unregister_format(klass, format):
806
assert klass._formats[format.get_format_string()] is format
1695
807
del klass._formats[format.get_format_string()]
1697
809
def __str__(self):
1698
return self.get_format_description().rstrip()
810
return self.get_format_string().rstrip()
1700
812
def supports_tags(self):
1701
813
"""True if this format supports tags stored in the branch"""
1702
814
return False # by default
1705
class BranchHooks(Hooks):
816
# XXX: Probably doesn't really belong here -- mbp 20070212
817
def _initialize_control_files(self, a_bzrdir, utf8_files, lock_filename,
819
branch_transport = a_bzrdir.get_branch_transport(self)
820
control_files = lockable_files.LockableFiles(branch_transport,
821
lock_filename, lock_class)
822
control_files.create_lock()
823
control_files.lock_write()
825
for filename, content in utf8_files:
826
control_files.put_utf8(filename, content)
828
control_files.unlock()
831
class BranchHooks(dict):
1706
832
"""A dictionary mapping hook name to a list of callables for branch hooks.
1708
834
e.g. ['set_rh'] Is the list of items to be called when the
1709
835
set_revision_history function is invoked.
1715
841
These are all empty initially, because by default nothing should get
1718
Hooks.__init__(self)
1719
self.create_hook(HookPoint('set_rh',
1720
"Invoked whenever the revision history has been set via "
1721
"set_revision_history. The api signature is (branch, "
1722
"revision_history), and the branch will be write-locked. "
1723
"The set_rh hook can be expensive for bzr to trigger, a better "
1724
"hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1725
self.create_hook(HookPoint('open',
1726
"Called with the Branch object that has been opened after a "
1727
"branch is opened.", (1, 8), None))
1728
self.create_hook(HookPoint('post_push',
1729
"Called after a push operation completes. post_push is called "
1730
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1731
"bzr client.", (0, 15), None))
1732
self.create_hook(HookPoint('post_pull',
1733
"Called after a pull operation completes. post_pull is called "
1734
"with a bzrlib.branch.PullResult object and only runs in the "
1735
"bzr client.", (0, 15), None))
1736
self.create_hook(HookPoint('pre_commit',
1737
"Called after a commit is calculated but before it is is "
1738
"completed. pre_commit is called with (local, master, old_revno, "
1739
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1740
"). old_revid is NULL_REVISION for the first commit to a branch, "
1741
"tree_delta is a TreeDelta object describing changes from the "
1742
"basis revision. hooks MUST NOT modify this delta. "
1743
" future_tree is an in-memory tree obtained from "
1744
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1745
"tree.", (0,91), None))
1746
self.create_hook(HookPoint('post_commit',
1747
"Called in the bzr client after a commit has completed. "
1748
"post_commit is called with (local, master, old_revno, old_revid, "
1749
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1750
"commit to a branch.", (0, 15), None))
1751
self.create_hook(HookPoint('post_uncommit',
1752
"Called in the bzr client after an uncommit completes. "
1753
"post_uncommit is called with (local, master, old_revno, "
1754
"old_revid, new_revno, new_revid) where local is the local branch "
1755
"or None, master is the target branch, and an empty branch "
1756
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1757
self.create_hook(HookPoint('pre_change_branch_tip',
1758
"Called in bzr client and server before a change to the tip of a "
1759
"branch is made. pre_change_branch_tip is called with a "
1760
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1761
"commit, uncommit will all trigger this hook.", (1, 6), None))
1762
self.create_hook(HookPoint('post_change_branch_tip',
1763
"Called in bzr client and server after a change to the tip of a "
1764
"branch is made. post_change_branch_tip is called with a "
1765
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1766
"commit, uncommit will all trigger this hook.", (1, 4), None))
1767
self.create_hook(HookPoint('transform_fallback_location',
1768
"Called when a stacked branch is activating its fallback "
1769
"locations. transform_fallback_location is called with (branch, "
1770
"url), and should return a new url. Returning the same url "
1771
"allows it to be used as-is, returning a different one can be "
1772
"used to cause the branch to stack on a closer copy of that "
1773
"fallback_location. Note that the branch cannot have history "
1774
"accessing methods called on it during this hook because the "
1775
"fallback locations have not been activated. When there are "
1776
"multiple hooks installed for transform_fallback_location, "
1777
"all are called with the url returned from the previous hook."
1778
"The order is however undefined.", (1, 9), None))
1779
self.create_hook(HookPoint('automatic_tag_name',
1780
"Called to determine an automatic tag name for a revision."
1781
"automatic_tag_name is called with (branch, revision_id) and "
1782
"should return a tag name or None if no tag name could be "
1783
"determined. The first non-None tag name returned will be used.",
1785
self.create_hook(HookPoint('post_branch_init',
1786
"Called after new branch initialization completes. "
1787
"post_branch_init is called with a "
1788
"bzrlib.branch.BranchInitHookParams. "
1789
"Note that init, branch and checkout (both heavyweight and "
1790
"lightweight) will all trigger this hook.", (2, 2), None))
1791
self.create_hook(HookPoint('post_switch',
1792
"Called after a checkout switches branch. "
1793
"post_switch is called with a "
1794
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
845
# Introduced in 0.15:
846
# invoked whenever the revision history has been set
847
# with set_revision_history. The api signature is
848
# (branch, revision_history), and the branch will
851
# invoked after a push operation completes.
852
# the api signature is
854
# containing the members
855
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
856
# where local is the local branch or None, master is the target
857
# master branch, and the rest should be self explanatory. The source
858
# is read locked and the target branches write locked. Source will
859
# be the local low-latency branch.
860
self['post_push'] = []
861
# invoked after a pull operation completes.
862
# the api signature is
864
# containing the members
865
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
866
# where local is the local branch or None, master is the target
867
# master branch, and the rest should be self explanatory. The source
868
# is read locked and the target branches write locked. The local
869
# branch is the low-latency branch.
870
self['post_pull'] = []
871
# invoked after a commit operation completes.
872
# the api signature is
873
# (local, master, old_revno, old_revid, new_revno, new_revid)
874
# old_revid is NULL_REVISION for the first commit to a branch.
875
self['post_commit'] = []
876
# invoked after a uncommit operation completes.
877
# the api signature is
878
# (local, master, old_revno, old_revid, new_revno, new_revid) where
879
# local is the local branch or None, master is the target branch,
880
# and an empty branch recieves new_revno of 0, new_revid of None.
881
self['post_uncommit'] = []
883
def install_hook(self, hook_name, a_callable):
884
"""Install a_callable in to the hook hook_name.
886
:param hook_name: A hook name. See the __init__ method of BranchHooks
887
for the complete list of hooks.
888
:param a_callable: The callable to be invoked when the hook triggers.
889
The exact signature will depend on the hook - see the __init__
890
method of BranchHooks for details on each hook.
893
self[hook_name].append(a_callable)
895
raise errors.UnknownHook('branch', hook_name)
1798
898
# install the default hooks into the Branch class.
1799
899
Branch.hooks = BranchHooks()
1802
class ChangeBranchTipParams(object):
1803
"""Object holding parameters passed to *_change_branch_tip hooks.
1805
There are 5 fields that hooks may wish to access:
1807
:ivar branch: the branch being changed
1808
:ivar old_revno: revision number before the change
1809
:ivar new_revno: revision number after the change
1810
:ivar old_revid: revision id before the change
1811
:ivar new_revid: revision id after the change
1813
The revid fields are strings. The revno fields are integers.
1816
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1817
"""Create a group of ChangeBranchTip parameters.
1819
:param branch: The branch being changed.
1820
:param old_revno: Revision number before the change.
1821
:param new_revno: Revision number after the change.
1822
:param old_revid: Tip revision id before the change.
1823
:param new_revid: Tip revision id after the change.
1825
self.branch = branch
1826
self.old_revno = old_revno
1827
self.new_revno = new_revno
1828
self.old_revid = old_revid
1829
self.new_revid = new_revid
1831
def __eq__(self, other):
1832
return self.__dict__ == other.__dict__
1835
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1836
self.__class__.__name__, self.branch,
1837
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1840
class BranchInitHookParams(object):
1841
"""Object holding parameters passed to *_branch_init hooks.
1843
There are 4 fields that hooks may wish to access:
1845
:ivar format: the branch format
1846
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1847
:ivar name: name of colocated branch, if any (or None)
1848
:ivar branch: the branch created
1850
Note that for lightweight checkouts, the bzrdir and format fields refer to
1851
the checkout, hence they are different from the corresponding fields in
1852
branch, which refer to the original branch.
1855
def __init__(self, format, a_bzrdir, name, branch):
1856
"""Create a group of BranchInitHook parameters.
1858
:param format: the branch format
1859
:param a_bzrdir: the BzrDir where the branch will be/has been
1861
:param name: name of colocated branch, if any (or None)
1862
:param branch: the branch created
1864
Note that for lightweight checkouts, the bzrdir and format fields refer
1865
to the checkout, hence they are different from the corresponding fields
1866
in branch, which refer to the original branch.
1868
self.format = format
1869
self.bzrdir = a_bzrdir
1871
self.branch = branch
1873
def __eq__(self, other):
1874
return self.__dict__ == other.__dict__
1878
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1880
return "<%s of format:%s bzrdir:%s>" % (
1881
self.__class__.__name__, self.branch,
1882
self.format, self.bzrdir)
1885
class SwitchHookParams(object):
1886
"""Object holding parameters passed to *_switch hooks.
1888
There are 4 fields that hooks may wish to access:
1890
:ivar control_dir: BzrDir of the checkout to change
1891
:ivar to_branch: branch that the checkout is to reference
1892
:ivar force: skip the check for local commits in a heavy checkout
1893
:ivar revision_id: revision ID to switch to (or None)
1896
def __init__(self, control_dir, to_branch, force, revision_id):
1897
"""Create a group of SwitchHook parameters.
1899
:param control_dir: BzrDir of the checkout to change
1900
:param to_branch: branch that the checkout is to reference
1901
:param force: skip the check for local commits in a heavy checkout
1902
:param revision_id: revision ID to switch to (or None)
1904
self.control_dir = control_dir
1905
self.to_branch = to_branch
1907
self.revision_id = revision_id
1909
def __eq__(self, other):
1910
return self.__dict__ == other.__dict__
1913
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1914
self.control_dir, self.to_branch,
1918
902
class BzrBranchFormat4(BranchFormat):
1919
903
"""Bzr branch format 4.
1927
911
"""See BranchFormat.get_format_description()."""
1928
912
return "Branch format 4"
1930
def initialize(self, a_bzrdir, name=None):
914
def initialize(self, a_bzrdir):
1931
915
"""Create a branch of this format in a_bzrdir."""
1932
916
utf8_files = [('revision-history', ''),
1933
917
('branch-name', ''),
1935
return self._initialize_helper(a_bzrdir, utf8_files, name=name,
919
return self._initialize_helper(a_bzrdir, utf8_files,
1936
920
lock_type='branch4', set_format=False)
1938
922
def __init__(self):
1939
923
super(BzrBranchFormat4, self).__init__()
1940
924
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1942
def network_name(self):
1943
"""The network name for this format is the control dirs disk label."""
1944
return self._matchingbzrdir.get_format_string()
926
def open(self, a_bzrdir, _found=False):
927
"""Return the branch object for a_bzrdir
1946
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1947
"""See BranchFormat.open()."""
929
_found is a private parameter, do not use it. It is used to indicate
930
if format probing has already be done.
1949
933
# we are being called directly and must probe.
1950
934
raise NotImplementedError
1951
935
return BzrBranch(_format=self,
1952
936
_control_files=a_bzrdir._control_files,
1953
937
a_bzrdir=a_bzrdir,
1955
938
_repository=a_bzrdir.open_repository())
1957
940
def __str__(self):
1958
941
return "Bazaar-NG branch format 4"
1961
class BranchFormatMetadir(BranchFormat):
1962
"""Common logic for meta-dir based branch formats."""
1964
def _branch_class(self):
1965
"""What class to instantiate on open calls."""
1966
raise NotImplementedError(self._branch_class)
1968
def network_name(self):
1969
"""A simple byte string uniquely identifying this format for RPC calls.
1971
Metadir branch formats use their format string.
1973
return self.get_format_string()
1975
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1976
"""See BranchFormat.open()."""
1978
format = BranchFormat.find_format(a_bzrdir, name=name)
1979
if format.__class__ != self.__class__:
1980
raise AssertionError("wrong format %r found for %r" %
1982
transport = a_bzrdir.get_branch_transport(None, name=name)
1984
control_files = lockable_files.LockableFiles(transport, 'lock',
1986
return self._branch_class()(_format=self,
1987
_control_files=control_files,
1990
_repository=a_bzrdir.find_repository(),
1991
ignore_fallbacks=ignore_fallbacks)
1992
except errors.NoSuchFile:
1993
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1996
super(BranchFormatMetadir, self).__init__()
1997
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1998
self._matchingbzrdir.set_branch_format(self)
2000
def supports_tags(self):
2004
class BzrBranchFormat5(BranchFormatMetadir):
944
class BzrBranchFormat5(BranchFormat):
2005
945
"""Bzr branch format 5.
2007
947
This format has:
2024
961
def get_format_description(self):
2025
962
"""See BranchFormat.get_format_description()."""
2026
963
return "Branch format 5"
2028
def initialize(self, a_bzrdir, name=None):
965
def initialize(self, a_bzrdir):
2029
966
"""Create a branch of this format in a_bzrdir."""
2030
967
utf8_files = [('revision-history', ''),
2031
968
('branch-name', ''),
2033
return self._initialize_helper(a_bzrdir, utf8_files, name)
2035
def supports_tags(self):
2039
class BzrBranchFormat6(BranchFormatMetadir):
2040
"""Branch format with last-revision and tags.
970
return self._initialize_helper(a_bzrdir, utf8_files)
973
super(BzrBranchFormat5, self).__init__()
974
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
976
def open(self, a_bzrdir, _found=False):
977
"""Return the branch object for a_bzrdir
979
_found is a private parameter, do not use it. It is used to indicate
980
if format probing has already be done.
983
format = BranchFormat.find_format(a_bzrdir)
984
assert format.__class__ == self.__class__
985
transport = a_bzrdir.get_branch_transport(None)
986
control_files = lockable_files.LockableFiles(transport, 'lock',
988
return BzrBranch5(_format=self,
989
_control_files=control_files,
991
_repository=a_bzrdir.find_repository())
994
class BzrBranchFormat6(BzrBranchFormat5):
995
"""Branch format with last-revision
2042
997
Unlike previous formats, this has no explicit revision history. Instead,
2043
998
this just stores the last-revision, and the left-hand history leading
2044
999
up to there is the history.
2046
1001
This format was introduced in bzr 0.15
2047
and became the default in 0.91.
2050
def _branch_class(self):
2053
1004
def get_format_string(self):
2054
1005
"""See BranchFormat.get_format_string()."""
2055
return "Bazaar Branch Format 6 (bzr 0.15)\n"
1006
return "Bazaar-NG branch format 6\n"
2057
1008
def get_format_description(self):
2058
1009
"""See BranchFormat.get_format_description()."""
2059
1010
return "Branch format 6"
2061
def initialize(self, a_bzrdir, name=None):
2062
"""Create a branch of this format in a_bzrdir."""
2063
utf8_files = [('last-revision', '0 null:\n'),
2064
('branch.conf', ''),
2067
return self._initialize_helper(a_bzrdir, utf8_files, name)
2069
def make_tags(self, branch):
2070
"""See bzrlib.branch.BranchFormat.make_tags()."""
2071
return BasicTags(branch)
2073
def supports_set_append_revisions_only(self):
2077
class BzrBranchFormat8(BranchFormatMetadir):
2078
"""Metadir format supporting storing locations of subtree branches."""
2080
def _branch_class(self):
2083
def get_format_string(self):
2084
"""See BranchFormat.get_format_string()."""
2085
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
2087
def get_format_description(self):
2088
"""See BranchFormat.get_format_description()."""
2089
return "Branch format 8"
2091
def initialize(self, a_bzrdir, name=None):
2092
"""Create a branch of this format in a_bzrdir."""
2093
utf8_files = [('last-revision', '0 null:\n'),
2094
('branch.conf', ''),
2098
return self._initialize_helper(a_bzrdir, utf8_files, name)
2101
super(BzrBranchFormat8, self).__init__()
2102
self._matchingbzrdir.repository_format = \
2103
RepositoryFormatKnitPack5RichRoot()
2105
def make_tags(self, branch):
2106
"""See bzrlib.branch.BranchFormat.make_tags()."""
2107
return BasicTags(branch)
2109
def supports_set_append_revisions_only(self):
2112
def supports_stacking(self):
2115
supports_reference_locations = True
2118
class BzrBranchFormat7(BzrBranchFormat8):
2119
"""Branch format with last-revision, tags, and a stacked location pointer.
2121
The stacked location pointer is passed down to the repository and requires
2122
a repository format with supports_external_lookups = True.
2124
This format was introduced in bzr 1.6.
2127
def initialize(self, a_bzrdir, name=None):
2128
"""Create a branch of this format in a_bzrdir."""
2129
utf8_files = [('last-revision', '0 null:\n'),
2130
('branch.conf', ''),
2133
return self._initialize_helper(a_bzrdir, utf8_files, name)
2135
def _branch_class(self):
2138
def get_format_string(self):
2139
"""See BranchFormat.get_format_string()."""
2140
return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
2142
def get_format_description(self):
2143
"""See BranchFormat.get_format_description()."""
2144
return "Branch format 7"
2146
def supports_set_append_revisions_only(self):
2149
supports_reference_locations = False
1012
def initialize(self, a_bzrdir):
1013
"""Create a branch of this format in a_bzrdir."""
1014
utf8_files = [('last-revision', '0 null:\n'),
1015
('branch-name', ''),
1016
('branch.conf', ''),
1019
return self._initialize_helper(a_bzrdir, utf8_files)
1021
def open(self, a_bzrdir, _found=False):
1022
"""Return the branch object for a_bzrdir
1024
_found is a private parameter, do not use it. It is used to indicate
1025
if format probing has already be done.
1028
format = BranchFormat.find_format(a_bzrdir)
1029
assert format.__class__ == self.__class__
1030
transport = a_bzrdir.get_branch_transport(None)
1031
control_files = lockable_files.LockableFiles(transport, 'lock',
1033
return BzrBranch6(_format=self,
1034
_control_files=control_files,
1036
_repository=a_bzrdir.find_repository())
1038
def supports_tags(self):
2152
1042
class BranchReferenceFormat(BranchFormat):
2167
1057
def get_format_description(self):
2168
1058
"""See BranchFormat.get_format_description()."""
2169
1059
return "Checkout reference format 1"
2171
def get_reference(self, a_bzrdir):
2172
"""See BranchFormat.get_reference()."""
2173
transport = a_bzrdir.get_branch_transport(None)
2174
return transport.get_bytes('location')
2176
def set_reference(self, a_bzrdir, to_branch):
2177
"""See BranchFormat.set_reference()."""
2178
transport = a_bzrdir.get_branch_transport(None)
2179
location = transport.put_bytes('location', to_branch.base)
2181
def initialize(self, a_bzrdir, name=None, target_branch=None):
1061
def initialize(self, a_bzrdir, target_branch=None):
2182
1062
"""Create a branch of this format in a_bzrdir."""
2183
1063
if target_branch is None:
2184
1064
# this format does not implement branch itself, thus the implicit
2185
1065
# creation contract must see it as uninitializable
2186
1066
raise errors.UninitializableFormat(self)
2187
mutter('creating branch reference in %s', a_bzrdir.user_url)
2188
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1067
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1068
branch_transport = a_bzrdir.get_branch_transport(self)
2189
1069
branch_transport.put_bytes('location',
2190
target_branch.bzrdir.user_url)
1070
target_branch.bzrdir.root_transport.base)
2191
1071
branch_transport.put_bytes('format', self.get_format_string())
2193
a_bzrdir, name, _found=True,
2194
possible_transports=[target_branch.bzrdir.root_transport])
2195
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1072
return self.open(a_bzrdir, _found=True)
2198
1074
def __init__(self):
2199
1075
super(BranchReferenceFormat, self).__init__()
2200
1076
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
2201
self._matchingbzrdir.set_branch_format(self)
2203
1078
def _make_reference_clone_function(format, a_branch):
2204
1079
"""Create a clone() routine for a branch dynamically."""
2205
def clone(to_bzrdir, revision_id=None,
2206
repository_policy=None):
1080
def clone(to_bzrdir, revision_id=None):
2207
1081
"""See Branch.clone()."""
2208
return format.initialize(to_bzrdir, target_branch=a_branch)
1082
return format.initialize(to_bzrdir, a_branch)
2209
1083
# cannot obey revision_id limits when cloning a reference ...
2210
1084
# FIXME RBC 20060210 either nuke revision_id for clone, or
2211
1085
# emit some sort of warning/error to the caller ?!
2214
def open(self, a_bzrdir, name=None, _found=False, location=None,
2215
possible_transports=None, ignore_fallbacks=False):
1088
def open(self, a_bzrdir, _found=False):
2216
1089
"""Return the branch that the branch reference in a_bzrdir points at.
2218
:param a_bzrdir: A BzrDir that contains a branch.
2219
:param name: Name of colocated branch to open, if any
2220
:param _found: a private parameter, do not use it. It is used to
2221
indicate if format probing has already be done.
2222
:param ignore_fallbacks: when set, no fallback branches will be opened
2223
(if there are any). Default is to open fallbacks.
2224
:param location: The location of the referenced branch. If
2225
unspecified, this will be determined from the branch reference in
2227
:param possible_transports: An optional reusable transports list.
1091
_found is a private parameter, do not use it. It is used to indicate
1092
if format probing has already be done.
2230
format = BranchFormat.find_format(a_bzrdir, name=name)
2231
if format.__class__ != self.__class__:
2232
raise AssertionError("wrong format %r found for %r" %
2234
if location is None:
2235
location = self.get_reference(a_bzrdir)
2236
real_bzrdir = bzrdir.BzrDir.open(
2237
location, possible_transports=possible_transports)
2238
result = real_bzrdir.open_branch(name=name,
2239
ignore_fallbacks=ignore_fallbacks)
1095
format = BranchFormat.find_format(a_bzrdir)
1096
assert format.__class__ == self.__class__
1097
transport = a_bzrdir.get_branch_transport(None)
1098
real_bzrdir = bzrdir.BzrDir.open(transport.get('location').read())
1099
result = real_bzrdir.open_branch()
2240
1100
# this changes the behaviour of result.clone to create a new reference
2241
1101
# rather than a copy of the content of the branch.
2242
1102
# I did not use a proxy object because that needs much more extensive
2252
network_format_registry = registry.FormatRegistry()
2253
"""Registry of formats indexed by their network name.
2255
The network name for a branch format is an identifier that can be used when
2256
referring to formats with smart server operations. See
2257
BranchFormat.network_name() for more detail.
2261
1112
# formats which have no format string are not discoverable
2262
1113
# and not independently creatable, so are not registered.
2263
__format5 = BzrBranchFormat5()
2264
__format6 = BzrBranchFormat6()
2265
__format7 = BzrBranchFormat7()
2266
__format8 = BzrBranchFormat8()
2267
BranchFormat.register_format(__format5)
1114
__default_format = BzrBranchFormat5()
1115
BranchFormat.register_format(__default_format)
2268
1116
BranchFormat.register_format(BranchReferenceFormat())
2269
BranchFormat.register_format(__format6)
2270
BranchFormat.register_format(__format7)
2271
BranchFormat.register_format(__format8)
2272
BranchFormat.set_default_format(__format7)
1117
BranchFormat.register_format(BzrBranchFormat6())
1118
BranchFormat.set_default_format(__default_format)
2273
1119
_legacy_formats = [BzrBranchFormat4(),
2275
network_format_registry.register(
2276
_legacy_formats[0].network_name(), _legacy_formats[0].__class__)
2279
class BranchWriteLockResult(object):
2280
"""The result of write locking a branch.
2282
:ivar branch_token: The token obtained from the underlying branch lock, or
2284
:ivar unlock: A callable which will unlock the lock.
2287
def __init__(self, unlock, branch_token):
2288
self.branch_token = branch_token
2289
self.unlock = unlock
2292
class BzrBranch(Branch, _RelockDebugMixin):
1122
class BzrBranch(Branch):
2293
1123
"""A branch stored in the actual filesystem.
2295
1125
Note that it's "local" in the context of the filesystem; it doesn't
2296
1126
really matter if it's on an nfs/smb/afs/coda/... share, as long as
2297
1127
it's writable, and can be accessed via the normal filesystem API.
2299
:ivar _transport: Transport for file operations on this branch's
2300
control files, typically pointing to the .bzr/branch directory.
2301
:ivar repository: Repository for this branch.
2302
:ivar base: The url of the base directory for this branch; the one
2303
containing the .bzr directory.
2304
:ivar name: Optional colocated branch name as it exists in the control
2308
def __init__(self, _format=None,
2309
_control_files=None, a_bzrdir=None, name=None,
2310
_repository=None, ignore_fallbacks=False):
2311
"""Create new branch object at a particular location."""
1130
def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
1131
relax_version_check=DEPRECATED_PARAMETER, _format=None,
1132
_control_files=None, a_bzrdir=None, _repository=None):
1133
"""Create new branch object at a particular location.
1135
transport -- A Transport object, defining how to access files.
1137
init -- If True, create new control files in a previously
1138
unversioned directory. If False, the branch must already
1141
relax_version_check -- If true, the usual check for the branch
1142
version is not applied. This is intended only for
1143
upgrade/recovery type use; it's not guaranteed that
1144
all operations will work on old format branches.
1146
Branch.__init__(self)
2312
1147
if a_bzrdir is None:
2313
raise ValueError('a_bzrdir must be supplied')
1148
self.bzrdir = bzrdir.BzrDir.open(transport.base)
2315
1150
self.bzrdir = a_bzrdir
1151
# self._transport used to point to the directory containing the
1152
# control directory, but was not used - now it's just the transport
1153
# for the branch control files. mbp 20070212
2316
1154
self._base = self.bzrdir.transport.clone('..').base
2318
# XXX: We should be able to just do
2319
# self.base = self.bzrdir.root_transport.base
2320
# but this does not quite work yet -- mbp 20080522
2321
1155
self._format = _format
2322
1156
if _control_files is None:
2323
1157
raise ValueError('BzrBranch _control_files is None')
2324
1158
self.control_files = _control_files
2325
1159
self._transport = _control_files._transport
1160
if deprecated_passed(init):
1161
warn("BzrBranch.__init__(..., init=XXX): The init parameter is "
1162
"deprecated as of bzr 0.8. Please use Branch.create().",
1166
# this is slower than before deprecation, oh well never mind.
1167
# -> its deprecated.
1168
self._initialize(transport.base)
1169
self._check_format(_format)
1170
if deprecated_passed(relax_version_check):
1171
warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
1172
"relax_version_check parameter is deprecated as of bzr 0.8. "
1173
"Please use BzrDir.open_downlevel, or a BzrBranchFormat's "
1177
if (not relax_version_check
1178
and not self._format.is_supported()):
1179
raise errors.UnsupportedFormatError(format=fmt)
1180
if deprecated_passed(transport):
1181
warn("BzrBranch.__init__(transport=XXX...): The transport "
1182
"parameter is deprecated as of bzr 0.8. "
1183
"Please use Branch.open, or bzrdir.open_branch().",
2326
1186
self.repository = _repository
2327
Branch.__init__(self)
2329
1188
def __str__(self):
2330
if self.name is None:
2331
return '%s(%s)' % (self.__class__.__name__, self.user_url)
2333
return '%s(%s,%s)' % (self.__class__.__name__, self.user_url,
1189
return '%s(%r)' % (self.__class__.__name__, self.base)
2336
1191
__repr__ = __str__
2342
1197
base = property(_get_base, doc="The URL for the root of this branch.")
2344
def _get_config(self):
2345
return TransportConfig(self._transport, 'branch.conf')
1199
def _finish_transaction(self):
1200
"""Exit the current transaction."""
1201
return self.control_files._finish_transaction()
1203
def get_transaction(self):
1204
"""Return the current active transaction.
1206
If no transaction is active, this returns a passthrough object
1207
for which all data is immediately flushed and no caching happens.
1209
# this is an explicit function so that we can do tricky stuff
1210
# when the storage in rev_storage is elsewhere.
1211
# we probably need to hook the two 'lock a location' and
1212
# 'have a transaction' together more delicately, so that
1213
# we can have two locks (branch and storage) and one transaction
1214
# ... and finishing the transaction unlocks both, but unlocking
1215
# does not. - RBC 20051121
1216
return self.control_files.get_transaction()
1218
def _set_transaction(self, transaction):
1219
"""Set a new active transaction."""
1220
return self.control_files._set_transaction(transaction)
1222
def abspath(self, name):
1223
"""See Branch.abspath."""
1224
return self.control_files._transport.abspath(name)
1226
def _check_format(self, format):
1227
"""Identify the branch format if needed.
1229
The format is stored as a reference to the format object in
1230
self._format for code that needs to check it later.
1232
The format parameter is either None or the branch format class
1233
used to open this branch.
1235
FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
1238
format = BranchFormat.find_format(self.bzrdir)
1239
self._format = format
1240
mutter("got branch format %s", self._format)
1243
def get_root_id(self):
1244
"""See Branch.get_root_id."""
1245
tree = self.repository.revision_tree(self.last_revision())
1246
return tree.inventory.root.file_id
2347
1248
def is_locked(self):
2348
1249
return self.control_files.is_locked()
2350
def lock_write(self, token=None):
2351
"""Lock the branch for write operations.
2353
:param token: A token to permit reacquiring a previously held and
2355
:return: A BranchWriteLockResult.
2357
if not self.is_locked():
2358
self._note_lock('w')
2359
# All-in-one needs to always unlock/lock.
2360
repo_control = getattr(self.repository, 'control_files', None)
2361
if self.control_files == repo_control or not self.is_locked():
2362
self.repository._warn_if_deprecated(self)
2363
self.repository.lock_write()
1251
def lock_write(self):
1252
self.repository.lock_write()
2368
return BranchWriteLockResult(self.unlock,
2369
self.control_files.lock_write(token=token))
1254
self.control_files.lock_write()
2372
self.repository.unlock()
1256
self.repository.unlock()
2375
1259
def lock_read(self):
2376
"""Lock the branch for read operations.
2378
:return: An object with an unlock method which will release the lock
2381
if not self.is_locked():
2382
self._note_lock('r')
2383
# All-in-one needs to always unlock/lock.
2384
repo_control = getattr(self.repository, 'control_files', None)
2385
if self.control_files == repo_control or not self.is_locked():
2386
self.repository._warn_if_deprecated(self)
2387
self.repository.lock_read()
1260
self.repository.lock_read()
2392
1262
self.control_files.lock_read()
2396
self.repository.unlock()
1264
self.repository.unlock()
2399
@only_raises(errors.LockNotHeld, errors.LockBroken)
2400
1267
def unlock(self):
1268
# TODO: test for failed two phase locks. This is known broken.
2402
1270
self.control_files.unlock()
2404
# All-in-one needs to always unlock/lock.
2405
repo_control = getattr(self.repository, 'control_files', None)
2406
if (self.control_files == repo_control or
2407
not self.control_files.is_locked()):
2408
self.repository.unlock()
2409
if not self.control_files.is_locked():
2410
# we just released the lock
2411
self._clear_cached_state()
1272
self.repository.unlock()
2413
1274
def peek_lock_mode(self):
2414
1275
if self.control_files._lock_count == 0:
2424
1285
"""See Branch.print_file."""
2425
1286
return self.repository.print_file(file, revision_id)
1289
def append_revision(self, *revision_ids):
1290
"""See Branch.append_revision."""
1291
revision_ids = [osutils.safe_revision_id(r) for r in revision_ids]
1292
for revision_id in revision_ids:
1293
_mod_revision.check_not_reserved_id(revision_id)
1294
mutter("add {%s} to revision-history" % revision_id)
1295
rev_history = self.revision_history()
1296
rev_history.extend(revision_ids)
1297
self.set_revision_history(rev_history)
2427
1299
def _write_revision_history(self, history):
2428
1300
"""Factored out of set_revision_history.
2430
1302
This performs the actual writing to disk.
2431
1303
It is intended to be called by BzrBranch5.set_revision_history."""
2432
self._transport.put_bytes(
2433
'revision-history', '\n'.join(history),
2434
mode=self.bzrdir._get_file_mode())
1304
self.control_files.put_bytes(
1305
'revision-history', '\n'.join(history))
2436
1307
@needs_write_lock
2437
1308
def set_revision_history(self, rev_history):
2438
1309
"""See Branch.set_revision_history."""
2439
if 'evil' in debug.debug_flags:
2440
mutter_callsite(3, "set_revision_history scales with history.")
2441
check_not_reserved_id = _mod_revision.check_not_reserved_id
2442
for rev_id in rev_history:
2443
check_not_reserved_id(rev_id)
2444
if Branch.hooks['post_change_branch_tip']:
2445
# Don't calculate the last_revision_info() if there are no hooks
2447
old_revno, old_revid = self.last_revision_info()
2448
if len(rev_history) == 0:
2449
revid = _mod_revision.NULL_REVISION
2451
revid = rev_history[-1]
2452
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
1310
rev_history = [osutils.safe_revision_id(r) for r in rev_history]
2453
1311
self._write_revision_history(rev_history)
2454
self._clear_cached_state()
2455
self._cache_revision_history(rev_history)
1312
transaction = self.get_transaction()
1313
history = transaction.map.find_revision_history()
1314
if history is not None:
1315
# update the revision history in the identity map.
1316
history[:] = list(rev_history)
1317
# this call is disabled because revision_history is
1318
# not really an object yet, and the transaction is for objects.
1319
# transaction.register_dirty(history)
1321
transaction.map.add_revision_history(rev_history)
1322
# this call is disabled because revision_history is
1323
# not really an object yet, and the transaction is for objects.
1324
# transaction.register_clean(history)
2456
1325
for hook in Branch.hooks['set_rh']:
2457
1326
hook(self, rev_history)
2458
if Branch.hooks['post_change_branch_tip']:
2459
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2461
def _synchronize_history(self, destination, revision_id):
2462
"""Synchronize last revision and revision history between branches.
2464
This version is most efficient when the destination is also a
2465
BzrBranch5, but works for BzrBranch6 as long as the revision
2466
history is the true lefthand parent history, and all of the revisions
2467
are in the destination's repository. If not, set_revision_history
2470
:param destination: The branch to copy the history into
2471
:param revision_id: The revision-id to truncate history at. May
2472
be None to copy complete history.
2474
if not isinstance(destination._format, BzrBranchFormat5):
2475
super(BzrBranch, self)._synchronize_history(
2476
destination, revision_id)
2478
if revision_id == _mod_revision.NULL_REVISION:
2481
new_history = self.revision_history()
2482
if revision_id is not None and new_history != []:
2484
new_history = new_history[:new_history.index(revision_id) + 1]
2486
rev = self.repository.get_revision(revision_id)
2487
new_history = rev.get_history(self.repository)[1:]
2488
destination.set_revision_history(new_history)
2490
1328
@needs_write_lock
2491
1329
def set_last_revision_info(self, revno, revision_id):
2492
"""Set the last revision of this branch.
2494
The caller is responsible for checking that the revno is correct
2495
for this revision id.
2497
It may be possible to set the branch last revision to an id not
2498
present in the repository. However, branches can also be
2499
configured to check constraints on history, in which case this may not
2502
revision_id = _mod_revision.ensure_null(revision_id)
2503
# this old format stores the full history, but this api doesn't
2504
# provide it, so we must generate, and might as well check it's
1330
revision_id = osutils.safe_revision_id(revision_id)
2506
1331
history = self._lefthand_history(revision_id)
2507
if len(history) != revno:
2508
raise AssertionError('%d != %d' % (len(history), revno))
1332
assert len(history) == revno, '%d != %d' % (len(history), revno)
2509
1333
self.set_revision_history(history)
2511
1335
def _gen_revision_history(self):
2512
history = self._transport.get_bytes('revision-history').split('\n')
2513
if history[-1:] == ['']:
2514
# There shouldn't be a trailing newline, but just in case.
1336
get_cached_utf8 = cache_utf8.get_cached_utf8
1337
history = [get_cached_utf8(l.rstrip('\r\n')) for l in
1338
self.control_files.get('revision-history').readlines()]
1342
def revision_history(self):
1343
"""See Branch.revision_history."""
1344
transaction = self.get_transaction()
1345
history = transaction.map.find_revision_history()
1346
if history is not None:
1347
# mutter("cache hit for revision-history in %s", self)
1348
return list(history)
1349
history = self._gen_revision_history()
1350
transaction.map.add_revision_history(history)
1351
# this call is disabled because revision_history is
1352
# not really an object yet, and the transaction is for objects.
1353
# transaction.register_clean(history, precious=True)
1354
return list(history)
1356
def _lefthand_history(self, revision_id, last_rev=None,
1358
# stop_revision must be a descendant of last_revision
1359
stop_graph = self.repository.get_revision_graph(revision_id)
1360
if last_rev is not None and last_rev not in stop_graph:
1361
# our previous tip is not merged into stop_revision
1362
raise errors.DivergedBranches(self, other_branch)
1363
# make a new revision history from the graph
1364
current_rev_id = revision_id
1366
while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1367
new_history.append(current_rev_id)
1368
current_rev_id_parents = stop_graph[current_rev_id]
1370
current_rev_id = current_rev_id_parents[0]
1372
current_rev_id = None
1373
new_history.reverse()
2518
1376
@needs_write_lock
2519
1377
def generate_revision_history(self, revision_id, last_rev=None,
2520
1378
other_branch=None):
2526
1384
:param other_branch: The other branch that DivergedBranches should
2527
1385
raise with respect to.
1387
revision_id = osutils.safe_revision_id(revision_id)
2529
1388
self.set_revision_history(self._lefthand_history(revision_id,
2530
1389
last_rev, other_branch))
1392
def update_revisions(self, other, stop_revision=None):
1393
"""See Branch.update_revisions."""
1396
if stop_revision is None:
1397
stop_revision = other.last_revision()
1398
if stop_revision is None:
1399
# if there are no commits, we're done.
1402
stop_revision = osutils.safe_revision_id(stop_revision)
1403
# whats the current last revision, before we fetch [and change it
1405
last_rev = self.last_revision()
1406
# we fetch here regardless of whether we need to so that we pickup
1408
self.fetch(other, stop_revision)
1409
my_ancestry = self.repository.get_ancestry(last_rev)
1410
if stop_revision in my_ancestry:
1411
# last_revision is a descendant of stop_revision
1413
self.generate_revision_history(stop_revision, last_rev=last_rev,
2532
1418
def basis_tree(self):
2533
1419
"""See Branch.basis_tree."""
2534
1420
return self.repository.revision_tree(self.last_revision())
1422
@deprecated_method(zero_eight)
1423
def working_tree(self):
1424
"""Create a Working tree object for this branch."""
1426
from bzrlib.transport.local import LocalTransport
1427
if (self.base.find('://') != -1 or
1428
not isinstance(self._transport, LocalTransport)):
1429
raise NoWorkingTree(self.base)
1430
return self.bzrdir.open_workingtree()
1433
def pull(self, source, overwrite=False, stop_revision=None,
1434
_hook_master=None, _run_hooks=True):
1437
:param _hook_master: Private parameter - set the branch to
1438
be supplied as the master to push hooks.
1439
:param _run_hooks: Private parameter - allow disabling of
1440
hooks, used when pushing to a master branch.
1442
result = PullResult()
1443
result.source_branch = source
1444
result.target_branch = self
1447
result.old_revno, result.old_revid = self.last_revision_info()
1449
self.update_revisions(source, stop_revision)
1450
except DivergedBranches:
1454
if stop_revision is None:
1455
stop_revision = source.last_revision()
1456
self.generate_revision_history(stop_revision)
1457
result.tag_conflicts = source.tags.merge_to(self.tags)
1458
result.new_revno, result.new_revid = self.last_revision_info()
1460
result.master_branch = _hook_master
1461
result.local_branch = self
1463
result.master_branch = self
1464
result.local_branch = None
1466
for hook in Branch.hooks['post_pull']:
2536
1472
def _get_parent_location(self):
2537
1473
_locs = ['parent', 'pull', 'x-pull']
2538
1474
for l in _locs:
2540
return self._transport.get_bytes(l).strip('\n')
2541
except errors.NoSuchFile:
1476
return self.control_files.get(l).read().strip('\n')
2545
def _basic_push(self, target, overwrite, stop_revision):
2546
"""Basic implementation of push without bound branches or hooks.
2548
Must be called with source read locked and target write locked.
1482
def push(self, target, overwrite=False, stop_revision=None,
1483
_hook_master=None, _run_hooks=True):
1486
:param _hook_master: Private parameter - set the branch to
1487
be supplied as the master to push hooks.
1488
:param _run_hooks: Private parameter - allow disabling of
1489
hooks, used when pushing to a master branch.
2550
result = BranchPushResult()
1491
result = PushResult()
2551
1492
result.source_branch = self
2552
1493
result.target_branch = target
2553
result.old_revno, result.old_revid = target.last_revision_info()
2554
self.update_references(target)
2555
if result.old_revid != self.last_revision():
2556
# We assume that during 'push' this repository is closer than
2558
graph = self.repository.get_graph(target.repository)
2559
target.update_revisions(self, stop_revision,
2560
overwrite=overwrite, graph=graph)
2561
if self._push_should_merge_tags():
2562
result.tag_conflicts = self.tags.merge_to(target.tags,
2564
result.new_revno, result.new_revid = target.last_revision_info()
1496
result.old_revno, result.old_revid = target.last_revision_info()
1498
target.update_revisions(self, stop_revision)
1499
except DivergedBranches:
1503
target.set_revision_history(self.revision_history())
1504
result.tag_conflicts = self.tags.merge_to(target.tags)
1505
result.new_revno, result.new_revid = target.last_revision_info()
1507
result.master_branch = _hook_master
1508
result.local_branch = target
1510
result.master_branch = target
1511
result.local_branch = None
1513
for hook in Branch.hooks['post_push']:
2567
def get_stacked_on_url(self):
2568
raise errors.UnstackableBranchFormat(self._format, self.user_url)
1519
def get_parent(self):
1520
"""See Branch.get_parent."""
1522
assert self.base[-1] == '/'
1523
parent = self._get_parent_location()
1526
# This is an old-format absolute path to a local branch
1527
# turn it into a url
1528
if parent.startswith('/'):
1529
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1531
return urlutils.join(self.base[:-1], parent)
1532
except errors.InvalidURLJoin, e:
1533
raise errors.InaccessibleParent(parent, self.base)
1535
def get_push_location(self):
1536
"""See Branch.get_push_location."""
1537
push_loc = self.get_config().get_user_option('push_location')
2570
1540
def set_push_location(self, location):
2571
1541
"""See Branch.set_push_location."""
2573
1543
'push_location', location,
2574
1544
store=_mod_config.STORE_LOCATION_NORECURSE)
1547
def set_parent(self, url):
1548
"""See Branch.set_parent."""
1549
# TODO: Maybe delete old location files?
1550
# URLs should never be unicode, even on the local fs,
1551
# FIXUP this and get_parent in a future branch format bump:
1552
# read and rewrite the file, and have the new format code read
1553
# using .get not .get_utf8. RBC 20060125
1555
if isinstance(url, unicode):
1557
url = url.encode('ascii')
1558
except UnicodeEncodeError:
1559
raise bzrlib.errors.InvalidURL(url,
1560
"Urls must be 7-bit ascii, "
1561
"use bzrlib.urlutils.escape")
1562
url = urlutils.relative_url(self.base, url)
1563
self._set_parent_location(url)
2576
1565
def _set_parent_location(self, url):
2577
1566
if url is None:
2578
self._transport.delete('parent')
1567
self.control_files._transport.delete('parent')
2580
self._transport.put_bytes('parent', url + '\n',
2581
mode=self.bzrdir._get_file_mode())
1569
assert isinstance(url, str)
1570
self.control_files.put_bytes('parent', url + '\n')
1572
@deprecated_function(zero_nine)
1573
def tree_config(self):
1574
"""DEPRECATED; call get_config instead.
1575
TreeConfig has become part of BranchConfig."""
1576
return TreeConfig(self)
2584
1579
class BzrBranch5(BzrBranch):
2585
"""A format 5 branch. This supports new features over plain branches.
1580
"""A format 5 branch. This supports new features over plan branches.
2587
1582
It has support for a master_branch which is the data for bound branches.
1590
super(BzrBranch5, self).__init__(_format=_format,
1591
_control_files=_control_files,
1593
_repository=_repository)
1596
def pull(self, source, overwrite=False, stop_revision=None,
1598
"""Extends branch.pull to be bound branch aware.
1600
:param _run_hooks: Private parameter used to force hook running
1601
off during bound branch double-pushing.
1603
bound_location = self.get_bound_location()
1604
master_branch = None
1605
if bound_location and source.base != bound_location:
1606
# not pulling from master, so we need to update master.
1607
master_branch = self.get_master_branch()
1608
master_branch.lock_write()
1611
# pull from source into master.
1612
master_branch.pull(source, overwrite, stop_revision,
1614
return super(BzrBranch5, self).pull(source, overwrite,
1615
stop_revision, _hook_master=master_branch,
1616
_run_hooks=_run_hooks)
1619
master_branch.unlock()
1622
def push(self, target, overwrite=False, stop_revision=None):
1623
"""Updates branch.push to be bound branch aware."""
1624
bound_location = target.get_bound_location()
1625
master_branch = None
1626
if bound_location and target.base != bound_location:
1627
# not pushing to master, so we need to update master.
1628
master_branch = target.get_master_branch()
1629
master_branch.lock_write()
1632
# push into the master from this branch.
1633
super(BzrBranch5, self).push(master_branch, overwrite,
1634
stop_revision, _run_hooks=False)
1635
# and push into the target branch from this. Note that we push from
1636
# this branch again, because its considered the highest bandwidth
1638
return super(BzrBranch5, self).push(target, overwrite,
1639
stop_revision, _hook_master=master_branch)
1642
master_branch.unlock()
2590
1644
def get_bound_location(self):
2592
return self._transport.get_bytes('bound')[:-1]
1646
return self.control_files.get_utf8('bound').read()[:-1]
2593
1647
except errors.NoSuchFile:
2596
1650
@needs_read_lock
2597
def get_master_branch(self, possible_transports=None):
1651
def get_master_branch(self):
2598
1652
"""Return the branch we are bound to.
2600
1654
:return: Either a Branch, or None
2602
1656
This could memoise the branch, but if thats done
2662
1730
return self.set_bound_location(None)
2664
1732
@needs_write_lock
2665
def update(self, possible_transports=None):
2666
"""Synchronise this branch with the master branch if any.
1734
"""Synchronise this branch with the master branch if any.
2668
1736
:return: None or the last_revision that was pivoted out during the
2671
master = self.get_master_branch(possible_transports)
1739
master = self.get_master_branch()
2672
1740
if master is not None:
2673
old_tip = _mod_revision.ensure_null(self.last_revision())
1741
old_tip = self.last_revision()
2674
1742
self.pull(master, overwrite=True)
2675
if self.repository.get_graph().is_ancestor(old_tip,
2676
_mod_revision.ensure_null(self.last_revision())):
1743
if old_tip in self.repository.get_ancestry(self.last_revision()):
2682
class BzrBranch8(BzrBranch5):
2683
"""A branch that stores tree-reference locations."""
2685
def _open_hook(self):
2686
if self._ignore_fallbacks:
1749
class BzrBranchExperimental(BzrBranch5):
1750
"""Bzr experimental branch format
1753
- a revision-history file.
1755
- a lock dir guarding the branch itself
1756
- all of this stored in a branch/ subdirectory
1757
- works with shared repositories.
1758
- a tag dictionary in the branch
1760
This format is new in bzr 0.15, but shouldn't be used for real data,
1763
This class acts as it's own BranchFormat.
1766
_matchingbzrdir = bzrdir.BzrDirMetaFormat1()
1769
def get_format_string(cls):
1770
"""See BranchFormat.get_format_string()."""
1771
return "Bazaar-NG branch format experimental\n"
1774
def get_format_description(cls):
1775
"""See BranchFormat.get_format_description()."""
1776
return "Experimental branch format"
1779
def _initialize_control_files(cls, a_bzrdir, utf8_files, lock_filename,
1781
branch_transport = a_bzrdir.get_branch_transport(cls)
1782
control_files = lockable_files.LockableFiles(branch_transport,
1783
lock_filename, lock_class)
1784
control_files.create_lock()
1785
control_files.lock_write()
2689
url = self.get_stacked_on_url()
2690
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2691
errors.UnstackableBranchFormat):
2694
for hook in Branch.hooks['transform_fallback_location']:
2695
url = hook(self, url)
2697
hook_name = Branch.hooks.get_hook_name(hook)
2698
raise AssertionError(
2699
"'transform_fallback_location' hook %s returned "
2700
"None, not a URL." % hook_name)
2701
self._activate_fallback_location(url)
2703
def __init__(self, *args, **kwargs):
2704
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2705
super(BzrBranch8, self).__init__(*args, **kwargs)
2706
self._last_revision_info_cache = None
2707
self._reference_info = None
2709
def _clear_cached_state(self):
2710
super(BzrBranch8, self)._clear_cached_state()
2711
self._last_revision_info_cache = None
2712
self._reference_info = None
2714
def _last_revision_info(self):
2715
revision_string = self._transport.get_bytes('last-revision')
1787
for filename, content in utf8_files:
1788
control_files.put_utf8(filename, content)
1790
control_files.unlock()
1793
def initialize(cls, a_bzrdir):
1794
"""Create a branch of this format in a_bzrdir."""
1795
utf8_files = [('format', cls.get_format_string()),
1796
('revision-history', ''),
1797
('branch-name', ''),
1800
cls._initialize_control_files(a_bzrdir, utf8_files,
1801
'lock', lockdir.LockDir)
1802
return cls.open(a_bzrdir, _found=True)
1805
def open(cls, a_bzrdir, _found=False):
1806
"""Return the branch object for a_bzrdir
1808
_found is a private parameter, do not use it. It is used to indicate
1809
if format probing has already be done.
1812
format = BranchFormat.find_format(a_bzrdir)
1813
assert format.__class__ == cls
1814
transport = a_bzrdir.get_branch_transport(None)
1815
control_files = lockable_files.LockableFiles(transport, 'lock',
1817
return cls(_format=cls,
1818
_control_files=control_files,
1820
_repository=a_bzrdir.find_repository())
1823
def is_supported(cls):
1826
def _make_tags(self):
1827
return BasicTags(self)
1830
def supports_tags(cls):
1834
BranchFormat.register_format(BzrBranchExperimental)
1837
class BzrBranch6(BzrBranch5):
1840
def last_revision_info(self):
1841
revision_string = self.control_files.get('last-revision').read()
2716
1842
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2717
1843
revision_id = cache_utf8.get_cached_utf8(revision_id)
2718
1844
revno = int(revno)
2719
1845
return revno, revision_id
1847
def last_revision(self):
1848
"""Return last revision id, or None"""
1849
revision_id = self.last_revision_info()[1]
1850
if revision_id == _mod_revision.NULL_REVISION:
2721
1854
def _write_last_revision_info(self, revno, revision_id):
2722
1855
"""Simply write out the revision id, with no checks.
2727
1860
Intended to be called by set_last_revision_info and
2728
1861
_write_revision_history.
2730
revision_id = _mod_revision.ensure_null(revision_id)
1863
if revision_id is None:
1864
revision_id = 'null:'
2731
1865
out_string = '%d %s\n' % (revno, revision_id)
2732
self._transport.put_bytes('last-revision', out_string,
2733
mode=self.bzrdir._get_file_mode())
1866
self.control_files.put_bytes('last-revision', out_string)
2735
1868
@needs_write_lock
2736
1869
def set_last_revision_info(self, revno, revision_id):
2737
revision_id = _mod_revision.ensure_null(revision_id)
2738
old_revno, old_revid = self.last_revision_info()
1870
revision_id = osutils.safe_revision_id(revision_id)
2739
1871
if self._get_append_revisions_only():
2740
1872
self._check_history_violation(revision_id)
2741
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2742
1873
self._write_last_revision_info(revno, revision_id)
2743
self._clear_cached_state()
2744
self._last_revision_info_cache = revno, revision_id
2745
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2747
def _synchronize_history(self, destination, revision_id):
2748
"""Synchronize last revision and revision history between branches.
2750
:see: Branch._synchronize_history
2752
# XXX: The base Branch has a fast implementation of this method based
2753
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2754
# that uses set_revision_history. This class inherits from BzrBranch5,
2755
# but wants the fast implementation, so it calls
2756
# Branch._synchronize_history directly.
2757
Branch._synchronize_history(self, destination, revision_id)
1874
transaction = self.get_transaction()
1875
cached_history = transaction.map.find_revision_history()
1876
if cached_history is not None:
1877
transaction.map.remove_object(cached_history)
2759
1879
def _check_history_violation(self, revision_id):
2760
last_revision = _mod_revision.ensure_null(self.last_revision())
2761
if _mod_revision.is_null(last_revision):
1880
last_revision = self.last_revision()
1881
if last_revision is None:
2763
1883
if last_revision not in self._lefthand_history(revision_id):
2764
raise errors.AppendRevisionsOnlyViolation(self.user_url)
1884
raise errors.AppendRevisionsOnlyViolation(self.base)
2766
1886
def _gen_revision_history(self):
2767
1887
"""Generate the revision history from last revision
2769
last_revno, last_revision = self.last_revision_info()
2770
self._extend_partial_history(stop_index=last_revno-1)
2771
return list(reversed(self._partial_revision_history_cache))
1889
history = list(self.repository.iter_reverse_revision_history(
1890
self.last_revision()))
2773
1894
def _write_revision_history(self, history):
2774
1895
"""Factored out of set_revision_history.
2796
1955
"""Set the parent branch"""
2797
1956
return self._get_config_location('parent_location')
2800
def _set_all_reference_info(self, info_dict):
2801
"""Replace all reference info stored in a branch.
2803
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2806
writer = rio.RioWriter(s)
2807
for key, (tree_path, branch_location) in info_dict.iteritems():
2808
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2809
branch_location=branch_location)
2810
writer.write_stanza(stanza)
2811
self._transport.put_bytes('references', s.getvalue())
2812
self._reference_info = info_dict
2815
def _get_all_reference_info(self):
2816
"""Return all the reference info stored in a branch.
2818
:return: A dict of {file_id: (tree_path, branch_location)}
2820
if self._reference_info is not None:
2821
return self._reference_info
2822
rio_file = self._transport.get('references')
2824
stanzas = rio.read_stanzas(rio_file)
2825
info_dict = dict((s['file_id'], (s['tree_path'],
2826
s['branch_location'])) for s in stanzas)
2829
self._reference_info = info_dict
2832
def set_reference_info(self, file_id, tree_path, branch_location):
2833
"""Set the branch location to use for a tree reference.
2835
:param file_id: The file-id of the tree reference.
2836
:param tree_path: The path of the tree reference in the tree.
2837
:param branch_location: The location of the branch to retrieve tree
2840
info_dict = self._get_all_reference_info()
2841
info_dict[file_id] = (tree_path, branch_location)
2842
if None in (tree_path, branch_location):
2843
if tree_path is not None:
2844
raise ValueError('tree_path must be None when branch_location'
2846
if branch_location is not None:
2847
raise ValueError('branch_location must be None when tree_path'
2849
del info_dict[file_id]
2850
self._set_all_reference_info(info_dict)
2852
def get_reference_info(self, file_id):
2853
"""Get the tree_path and branch_location for a tree reference.
2855
:return: a tuple of (tree_path, branch_location)
2857
return self._get_all_reference_info().get(file_id, (None, None))
2859
def reference_parent(self, file_id, path, possible_transports=None):
2860
"""Return the parent branch for a tree-reference file_id.
2862
:param file_id: The file_id of the tree reference
2863
:param path: The path of the file_id in the tree
2864
:return: A branch associated with the file_id
2866
branch_location = self.get_reference_info(file_id)[1]
2867
if branch_location is None:
2868
return Branch.reference_parent(self, file_id, path,
2869
possible_transports)
2870
branch_location = urlutils.join(self.user_url, branch_location)
2871
return Branch.open(branch_location,
2872
possible_transports=possible_transports)
2874
1958
def set_push_location(self, location):
2875
1959
"""See Branch.set_push_location."""
2876
1960
self._set_config_location('push_location', location)
2909
1993
"""See Branch.get_old_bound_location"""
2910
1994
return self._get_bound_location(False)
2912
def get_stacked_on_url(self):
2913
# you can always ask for the URL; but you might not be able to use it
2914
# if the repo can't support stacking.
2915
## self._check_stackable_repo()
2916
stacked_url = self._get_config_location('stacked_on_location')
2917
if stacked_url is None:
2918
raise errors.NotStacked(self)
1996
def set_append_revisions_only(self, enabled):
2001
self.get_config().set_user_option('append_revisions_only', value)
2921
2003
def _get_append_revisions_only(self):
2922
return self.get_config(
2923
).get_user_option_as_bool('append_revisions_only')
2926
def generate_revision_history(self, revision_id, last_rev=None,
2928
"""See BzrBranch5.generate_revision_history"""
2929
history = self._lefthand_history(revision_id, last_rev, other_branch)
2930
revno = len(history)
2931
self.set_last_revision_info(revno, revision_id)
2934
def get_rev_id(self, revno, history=None):
2935
"""Find the revision id of the specified revno."""
2937
return _mod_revision.NULL_REVISION
2939
last_revno, last_revision_id = self.last_revision_info()
2940
if revno <= 0 or revno > last_revno:
2941
raise errors.NoSuchRevision(self, revno)
2943
if history is not None:
2944
return history[revno - 1]
2946
index = last_revno - revno
2947
if len(self._partial_revision_history_cache) <= index:
2948
self._extend_partial_history(stop_index=index)
2949
if len(self._partial_revision_history_cache) > index:
2950
return self._partial_revision_history_cache[index]
2004
value = self.get_config().get_user_option('append_revisions_only')
2005
return value == 'True'
2007
def _synchronize_history(self, destination, revision_id):
2008
"""Synchronize last revision and revision history between branches.
2010
This version is most efficient when the destination is also a
2011
BzrBranch6, but works for BzrBranch5, as long as the destination's
2012
repository contains all the lefthand ancestors of the intended
2013
last_revision. If not, set_last_revision_info will fail.
2015
:param destination: The branch to copy the history into
2016
:param revision_id: The revision-id to truncate history at. May
2017
be None to copy complete history.
2019
if revision_id is None:
2020
revno, revision_id = self.last_revision_info()
2952
raise errors.NoSuchRevision(self, revno)
2955
def revision_id_to_revno(self, revision_id):
2956
"""Given a revision id, return its revno"""
2957
if _mod_revision.is_null(revision_id):
2960
index = self._partial_revision_history_cache.index(revision_id)
2962
self._extend_partial_history(stop_revision=revision_id)
2963
index = len(self._partial_revision_history_cache) - 1
2964
if self._partial_revision_history_cache[index] != revision_id:
2965
raise errors.NoSuchRevision(self, revision_id)
2966
return self.revno() - index
2969
class BzrBranch7(BzrBranch8):
2970
"""A branch with support for a fallback repository."""
2972
def set_reference_info(self, file_id, tree_path, branch_location):
2973
Branch.set_reference_info(self, file_id, tree_path, branch_location)
2975
def get_reference_info(self, file_id):
2976
Branch.get_reference_info(self, file_id)
2978
def reference_parent(self, file_id, path, possible_transports=None):
2979
return Branch.reference_parent(self, file_id, path,
2980
possible_transports)
2983
class BzrBranch6(BzrBranch7):
2984
"""See BzrBranchFormat6 for the capabilities of this branch.
2986
This subclass of BzrBranch7 disables the new features BzrBranch7 added,
2022
revno = self.revision_id_to_revno(revision_id)
2023
destination.set_last_revision_info(revno, revision_id)
2025
def _make_tags(self):
2026
return BasicTags(self)
2029
class BranchTestProviderAdapter(object):
2030
"""A tool to generate a suite testing multiple branch formats at once.
2032
This is done by copying the test once for each transport and injecting
2033
the transport_server, transport_readonly_server, and branch_format
2034
classes into each copy. Each copy is also given a new id() to make it
2990
def get_stacked_on_url(self):
2991
raise errors.UnstackableBranchFormat(self._format, self.user_url)
2038
def __init__(self, transport_server, transport_readonly_server, formats):
2039
self._transport_server = transport_server
2040
self._transport_readonly_server = transport_readonly_server
2041
self._formats = formats
2043
def adapt(self, test):
2044
result = TestSuite()
2045
for branch_format, bzrdir_format in self._formats:
2046
new_test = deepcopy(test)
2047
new_test.transport_server = self._transport_server
2048
new_test.transport_readonly_server = self._transport_readonly_server
2049
new_test.bzrdir_format = bzrdir_format
2050
new_test.branch_format = branch_format
2051
def make_new_test_id():
2052
# the format can be either a class or an instance
2053
name = getattr(branch_format, '__name__',
2054
branch_format.__class__.__name__)
2055
new_id = "%s(%s)" % (new_test.id(), name)
2056
return lambda: new_id
2057
new_test.id = make_new_test_id()
2058
result.addTest(new_test)
2994
2062
######################################################################
3105
2160
new_branch.tags._set_tag_dict({})
3107
2162
# Copying done; now update target format
3108
new_branch._transport.put_bytes('format',
3109
format.get_format_string(),
3110
mode=new_branch.bzrdir._get_file_mode())
2163
new_branch.control_files.put_utf8('format',
2164
format.get_format_string())
3112
2166
# Clean up old files
3113
new_branch._transport.delete('revision-history')
2167
new_branch.control_files._transport.delete('revision-history')
3115
2169
branch.set_parent(None)
3116
except errors.NoSuchFile:
3118
2172
branch.set_bound_location(None)
3121
class Converter6to7(object):
3122
"""Perform an in-place upgrade of format 6 to format 7"""
3124
def convert(self, branch):
3125
format = BzrBranchFormat7()
3126
branch._set_config_location('stacked_on_location', '')
3127
# update target format
3128
branch._transport.put_bytes('format', format.get_format_string())
3131
class Converter7to8(object):
3132
"""Perform an in-place upgrade of format 6 to format 7"""
3134
def convert(self, branch):
3135
format = BzrBranchFormat8()
3136
branch._transport.put_bytes('references', '')
3137
# update target format
3138
branch._transport.put_bytes('format', format.get_format_string())
3141
def _run_with_write_locked_target(target, callable, *args, **kwargs):
3142
"""Run ``callable(*args, **kwargs)``, write-locking target for the
3145
_run_with_write_locked_target will attempt to release the lock it acquires.
3147
If an exception is raised by callable, then that exception *will* be
3148
propagated, even if the unlock attempt raises its own error. Thus
3149
_run_with_write_locked_target should be preferred to simply doing::
3153
return callable(*args, **kwargs)
3158
# This is very similar to bzrlib.decorators.needs_write_lock. Perhaps they
3159
# should share code?
3162
result = callable(*args, **kwargs)
3164
exc_info = sys.exc_info()
3168
raise exc_info[0], exc_info[1], exc_info[2]
3174
class InterBranch(InterObject):
3175
"""This class represents operations taking place between two branches.
3177
Its instances have methods like pull() and push() and contain
3178
references to the source and target repositories these operations
3179
can be carried out on.
3183
"""The available optimised InterBranch types."""
3186
def _get_branch_formats_to_test():
3187
"""Return a tuple with the Branch formats to use when testing."""
3188
raise NotImplementedError(InterBranch._get_branch_formats_to_test)
3190
def pull(self, overwrite=False, stop_revision=None,
3191
possible_transports=None, local=False):
3192
"""Mirror source into target branch.
3194
The target branch is considered to be 'local', having low latency.
3196
:returns: PullResult instance
3198
raise NotImplementedError(self.pull)
3200
def update_revisions(self, stop_revision=None, overwrite=False,
3202
"""Pull in new perfect-fit revisions.
3204
:param stop_revision: Updated until the given revision
3205
:param overwrite: Always set the branch pointer, rather than checking
3206
to see if it is a proper descendant.
3207
:param graph: A Graph object that can be used to query history
3208
information. This can be None.
3211
raise NotImplementedError(self.update_revisions)
3213
def push(self, overwrite=False, stop_revision=None,
3214
_override_hook_source_branch=None):
3215
"""Mirror the source branch into the target branch.
3217
The source branch is considered to be 'local', having low latency.
3219
raise NotImplementedError(self.push)
3222
class GenericInterBranch(InterBranch):
3223
"""InterBranch implementation that uses public Branch functions.
3227
def _get_branch_formats_to_test():
3228
return BranchFormat._default_format, BranchFormat._default_format
3230
def update_revisions(self, stop_revision=None, overwrite=False,
3232
"""See InterBranch.update_revisions()."""
3233
self.source.lock_read()
3235
other_revno, other_last_revision = self.source.last_revision_info()
3236
stop_revno = None # unknown
3237
if stop_revision is None:
3238
stop_revision = other_last_revision
3239
if _mod_revision.is_null(stop_revision):
3240
# if there are no commits, we're done.
3242
stop_revno = other_revno
3244
# what's the current last revision, before we fetch [and change it
3246
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3247
# we fetch here so that we don't process data twice in the common
3248
# case of having something to pull, and so that the check for
3249
# already merged can operate on the just fetched graph, which will
3250
# be cached in memory.
3251
self.target.fetch(self.source, stop_revision)
3252
# Check to see if one is an ancestor of the other
3255
graph = self.target.repository.get_graph()
3256
if self.target._check_if_descendant_or_diverged(
3257
stop_revision, last_rev, graph, self.source):
3258
# stop_revision is a descendant of last_rev, but we aren't
3259
# overwriting, so we're done.
3261
if stop_revno is None:
3263
graph = self.target.repository.get_graph()
3264
this_revno, this_last_revision = \
3265
self.target.last_revision_info()
3266
stop_revno = graph.find_distance_to_null(stop_revision,
3267
[(other_last_revision, other_revno),
3268
(this_last_revision, this_revno)])
3269
self.target.set_last_revision_info(stop_revno, stop_revision)
3271
self.source.unlock()
3273
def pull(self, overwrite=False, stop_revision=None,
3274
possible_transports=None, _hook_master=None, run_hooks=True,
3275
_override_hook_target=None, local=False):
3278
:param _hook_master: Private parameter - set the branch to
3279
be supplied as the master to pull hooks.
3280
:param run_hooks: Private parameter - if false, this branch
3281
is being called because it's the master of the primary branch,
3282
so it should not run its hooks.
3283
:param _override_hook_target: Private parameter - set the branch to be
3284
supplied as the target_branch to pull hooks.
3285
:param local: Only update the local branch, and not the bound branch.
3287
# This type of branch can't be bound.
3289
raise errors.LocalRequiresBoundBranch()
3290
result = PullResult()
3291
result.source_branch = self.source
3292
if _override_hook_target is None:
3293
result.target_branch = self.target
3295
result.target_branch = _override_hook_target
3296
self.source.lock_read()
3298
# We assume that during 'pull' the target repository is closer than
3300
self.source.update_references(self.target)
3301
graph = self.target.repository.get_graph(self.source.repository)
3302
# TODO: Branch formats should have a flag that indicates
3303
# that revno's are expensive, and pull() should honor that flag.
3305
result.old_revno, result.old_revid = \
3306
self.target.last_revision_info()
3307
self.target.update_revisions(self.source, stop_revision,
3308
overwrite=overwrite, graph=graph)
3309
# TODO: The old revid should be specified when merging tags,
3310
# so a tags implementation that versions tags can only
3311
# pull in the most recent changes. -- JRV20090506
3312
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3314
result.new_revno, result.new_revid = self.target.last_revision_info()
3316
result.master_branch = _hook_master
3317
result.local_branch = result.target_branch
3319
result.master_branch = result.target_branch
3320
result.local_branch = None
3322
for hook in Branch.hooks['post_pull']:
3325
self.source.unlock()
3328
def push(self, overwrite=False, stop_revision=None,
3329
_override_hook_source_branch=None):
3330
"""See InterBranch.push.
3332
This is the basic concrete implementation of push()
3334
:param _override_hook_source_branch: If specified, run
3335
the hooks passing this Branch as the source, rather than self.
3336
This is for use of RemoteBranch, where push is delegated to the
3337
underlying vfs-based Branch.
3339
# TODO: Public option to disable running hooks - should be trivial but
3341
self.source.lock_read()
3343
return _run_with_write_locked_target(
3344
self.target, self._push_with_bound_branches, overwrite,
3346
_override_hook_source_branch=_override_hook_source_branch)
3348
self.source.unlock()
3350
def _push_with_bound_branches(self, overwrite, stop_revision,
3351
_override_hook_source_branch=None):
3352
"""Push from source into target, and into target's master if any.
3355
if _override_hook_source_branch:
3356
result.source_branch = _override_hook_source_branch
3357
for hook in Branch.hooks['post_push']:
3360
bound_location = self.target.get_bound_location()
3361
if bound_location and self.target.base != bound_location:
3362
# there is a master branch.
3364
# XXX: Why the second check? Is it even supported for a branch to
3365
# be bound to itself? -- mbp 20070507
3366
master_branch = self.target.get_master_branch()
3367
master_branch.lock_write()
3369
# push into the master from the source branch.
3370
self.source._basic_push(master_branch, overwrite, stop_revision)
3371
# and push into the target branch from the source. Note that we
3372
# push from the source branch again, because its considered the
3373
# highest bandwidth repository.
3374
result = self.source._basic_push(self.target, overwrite,
3376
result.master_branch = master_branch
3377
result.local_branch = self.target
3381
master_branch.unlock()
3384
result = self.source._basic_push(self.target, overwrite,
3386
# TODO: Why set master_branch and local_branch if there's no
3387
# binding? Maybe cleaner to just leave them unset? -- mbp
3389
result.master_branch = self.target
3390
result.local_branch = None
3395
def is_compatible(self, source, target):
3396
# GenericBranch uses the public API, so always compatible
3400
class InterToBranch5(GenericInterBranch):
3403
def _get_branch_formats_to_test():
3404
return BranchFormat._default_format, BzrBranchFormat5()
3406
def pull(self, overwrite=False, stop_revision=None,
3407
possible_transports=None, run_hooks=True,
3408
_override_hook_target=None, local=False):
3409
"""Pull from source into self, updating my master if any.
3411
:param run_hooks: Private parameter - if false, this branch
3412
is being called because it's the master of the primary branch,
3413
so it should not run its hooks.
3415
bound_location = self.target.get_bound_location()
3416
if local and not bound_location:
3417
raise errors.LocalRequiresBoundBranch()
3418
master_branch = None
3419
if not local and bound_location and self.source.user_url != bound_location:
3420
# not pulling from master, so we need to update master.
3421
master_branch = self.target.get_master_branch(possible_transports)
3422
master_branch.lock_write()
3425
# pull from source into master.
3426
master_branch.pull(self.source, overwrite, stop_revision,
3428
return super(InterToBranch5, self).pull(overwrite,
3429
stop_revision, _hook_master=master_branch,
3430
run_hooks=run_hooks,
3431
_override_hook_target=_override_hook_target)
3434
master_branch.unlock()
3437
InterBranch.register_optimiser(GenericInterBranch)
3438
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
