124
89
if master is not None:
125
90
master.break_lock()
127
def _check_stackable_repo(self):
128
if not self.repository._format.supports_external_lookups:
129
raise errors.UnstackableRepositoryFormat(self.repository._format,
130
self.repository.base)
132
def _extend_partial_history(self, stop_index=None, stop_revision=None):
133
"""Extend the partial history to include a given index
135
If a stop_index is supplied, stop when that index has been reached.
136
If a stop_revision is supplied, stop when that revision is
137
encountered. Otherwise, stop when the beginning of history is
140
:param stop_index: The index which should be present. When it is
141
present, history extension will stop.
142
:param stop_revision: The revision id which should be present. When
143
it is encountered, history extension will stop.
145
if len(self._partial_revision_history_cache) == 0:
146
self._partial_revision_history_cache = [self.last_revision()]
147
repository._iter_for_revno(
148
self.repository, self._partial_revision_history_cache,
149
stop_index=stop_index, stop_revision=stop_revision)
150
if self._partial_revision_history_cache[-1] == _mod_revision.NULL_REVISION:
151
self._partial_revision_history_cache.pop()
153
def _get_check_refs(self):
154
"""Get the references needed for check().
158
revid = self.last_revision()
159
return [('revision-existence', revid), ('lefthand-distance', revid)]
162
def open(base, _unsupported=False, possible_transports=None):
93
@deprecated_method(zero_eight)
94
def open_downlevel(base):
95
"""Open a branch which may be of an old format."""
96
return Branch.open(base, _unsupported=True)
99
def open(base, _unsupported=False):
163
100
"""Open the branch rooted at base.
165
102
For instance, if the branch is at URL/.bzr/branch,
166
103
Branch.open(URL) -> a Branch instance.
168
control = bzrdir.BzrDir.open(base, _unsupported,
169
possible_transports=possible_transports)
170
return control.open_branch(_unsupported)
173
def open_from_transport(transport, _unsupported=False):
174
"""Open the branch rooted at transport"""
175
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
176
return control.open_branch(_unsupported)
179
def open_containing(url, possible_transports=None):
105
control = bzrdir.BzrDir.open(base, _unsupported)
106
return control.open_branch(_unsupported)
109
def open_containing(url):
180
110
"""Open an existing branch which contains url.
182
112
This probes for a branch at url, and searches upwards from there.
184
114
Basically we keep looking up until we find the control directory or
185
115
run into the root. If there isn't one, raises NotBranchError.
186
If there is one and it is either an unrecognised format or an unsupported
116
If there is one and it is either an unrecognised format or an unsupported
187
117
format, UnknownFormatError or UnsupportedFormatError are raised.
188
118
If there is one, it is returned, along with the unused portion of url.
190
control, relpath = bzrdir.BzrDir.open_containing(url,
120
control, relpath = bzrdir.BzrDir.open_containing(url)
192
121
return control.open_branch(), relpath
194
def _push_should_merge_tags(self):
195
"""Should _basic_push merge this branch's tags into the target?
197
The default implementation returns False if this branch has no tags,
198
and True the rest of the time. Subclasses may override this.
200
return self.supports_tags() and self.tags.get_tag_dict()
124
@deprecated_function(zero_eight)
125
def initialize(base):
126
"""Create a new working tree and branch, rooted at 'base' (url)
128
NOTE: This will soon be deprecated in favour of creation
131
return bzrdir.BzrDir.create_standalone_workingtree(base).branch
133
def setup_caching(self, cache_root):
134
"""Subclasses that care about caching should override this, and set
135
up cached stores located under cache_root.
137
# seems to be unused, 2006-01-13 mbp
138
warn('%s is deprecated' % self.setup_caching)
139
self.cache_root = cache_root
202
141
def get_config(self):
203
return BranchConfig(self)
205
def _get_config(self):
206
"""Get the concrete config for just the config in this branch.
208
This is not intended for client use; see Branch.get_config for the
213
:return: An object supporting get_option and set_option.
215
raise NotImplementedError(self._get_config)
217
def _get_fallback_repository(self, url):
218
"""Get the repository we fallback to at url."""
219
url = urlutils.join(self.base, url)
220
a_bzrdir = bzrdir.BzrDir.open(url,
221
possible_transports=[self.bzrdir.root_transport])
222
return a_bzrdir.open_branch().repository
224
def _get_tags_bytes(self):
225
"""Get the bytes of a serialised tags dict.
227
Note that not all branches support tags, nor do all use the same tags
228
logic: this method is specific to BasicTags. Other tag implementations
229
may use the same method name and behave differently, safely, because
230
of the double-dispatch via
231
format.make_tags->tags_instance->get_tags_dict.
233
:return: The bytes of the tags file.
234
:seealso: Branch._set_tags_bytes.
236
return self._transport.get_bytes('tags')
238
def _get_nick(self, local=False, possible_transports=None):
239
config = self.get_config()
240
# explicit overrides master, but don't look for master if local is True
241
if not local and not config.has_explicit_nickname():
243
master = self.get_master_branch(possible_transports)
244
if master is not None:
245
# return the master branch value
247
except errors.BzrError, e:
248
# Silently fall back to local implicit nick if the master is
250
mutter("Could not connect to bound branch, "
251
"falling back to local nick.\n " + str(e))
252
return config.get_nickname()
142
return bzrlib.config.BranchConfig(self)
145
return self.get_config().get_nickname()
254
147
def _set_nick(self, nick):
255
self.get_config().set_user_option('nickname', nick, warn_masked=True)
148
self.get_config().set_user_option('nickname', nick)
257
150
nick = property(_get_nick, _set_nick)
259
152
def is_locked(self):
260
raise NotImplementedError(self.is_locked)
262
def _lefthand_history(self, revision_id, last_rev=None,
264
if 'evil' in debug.debug_flags:
265
mutter_callsite(4, "_lefthand_history scales with history.")
266
# stop_revision must be a descendant of last_revision
267
graph = self.repository.get_graph()
268
if last_rev is not None:
269
if not graph.is_ancestor(last_rev, revision_id):
270
# our previous tip is not merged into stop_revision
271
raise errors.DivergedBranches(self, other_branch)
272
# make a new revision history from the graph
273
parents_map = graph.get_parent_map([revision_id])
274
if revision_id not in parents_map:
275
raise errors.NoSuchRevision(self, revision_id)
276
current_rev_id = revision_id
278
check_not_reserved_id = _mod_revision.check_not_reserved_id
279
# Do not include ghosts or graph origin in revision_history
280
while (current_rev_id in parents_map and
281
len(parents_map[current_rev_id]) > 0):
282
check_not_reserved_id(current_rev_id)
283
new_history.append(current_rev_id)
284
current_rev_id = parents_map[current_rev_id][0]
285
parents_map = graph.get_parent_map([current_rev_id])
286
new_history.reverse()
153
raise NotImplementedError('is_locked is abstract')
289
155
def lock_write(self):
290
raise NotImplementedError(self.lock_write)
156
raise NotImplementedError('lock_write is abstract')
292
158
def lock_read(self):
293
raise NotImplementedError(self.lock_read)
159
raise NotImplementedError('lock_read is abstract')
295
161
def unlock(self):
296
raise NotImplementedError(self.unlock)
162
raise NotImplementedError('unlock is abstract')
298
164
def peek_lock_mode(self):
299
165
"""Return lock mode for the Branch: 'r', 'w' or None"""
300
166
raise NotImplementedError(self.peek_lock_mode)
302
168
def get_physical_lock_status(self):
303
raise NotImplementedError(self.get_physical_lock_status)
306
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
307
"""Return the revision_id for a dotted revno.
309
:param revno: a tuple like (1,) or (1,1,2)
310
:param _cache_reverse: a private parameter enabling storage
311
of the reverse mapping in a top level cache. (This should
312
only be done in selective circumstances as we want to
313
avoid having the mapping cached multiple times.)
314
:return: the revision_id
315
:raises errors.NoSuchRevision: if the revno doesn't exist
317
rev_id = self._do_dotted_revno_to_revision_id(revno)
319
self._partial_revision_id_to_revno_cache[rev_id] = revno
322
def _do_dotted_revno_to_revision_id(self, revno):
323
"""Worker function for dotted_revno_to_revision_id.
325
Subclasses should override this if they wish to
326
provide a more efficient implementation.
329
return self.get_rev_id(revno[0])
330
revision_id_to_revno = self.get_revision_id_to_revno_map()
331
revision_ids = [revision_id for revision_id, this_revno
332
in revision_id_to_revno.iteritems()
333
if revno == this_revno]
334
if len(revision_ids) == 1:
335
return revision_ids[0]
337
revno_str = '.'.join(map(str, revno))
338
raise errors.NoSuchRevision(self, revno_str)
341
def revision_id_to_dotted_revno(self, revision_id):
342
"""Given a revision id, return its dotted revno.
344
:return: a tuple like (1,) or (400,1,3).
346
return self._do_revision_id_to_dotted_revno(revision_id)
348
def _do_revision_id_to_dotted_revno(self, revision_id):
349
"""Worker function for revision_id_to_revno."""
350
# Try the caches if they are loaded
351
result = self._partial_revision_id_to_revno_cache.get(revision_id)
352
if result is not None:
354
if self._revision_id_to_revno_cache:
355
result = self._revision_id_to_revno_cache.get(revision_id)
357
raise errors.NoSuchRevision(self, revision_id)
358
# Try the mainline as it's optimised
360
revno = self.revision_id_to_revno(revision_id)
362
except errors.NoSuchRevision:
363
# We need to load and use the full revno map after all
364
result = self.get_revision_id_to_revno_map().get(revision_id)
366
raise errors.NoSuchRevision(self, revision_id)
370
def get_revision_id_to_revno_map(self):
371
"""Return the revision_id => dotted revno map.
373
This will be regenerated on demand, but will be cached.
375
:return: A dictionary mapping revision_id => dotted revno.
376
This dictionary should not be modified by the caller.
378
if self._revision_id_to_revno_cache is not None:
379
mapping = self._revision_id_to_revno_cache
381
mapping = self._gen_revno_map()
382
self._cache_revision_id_to_revno(mapping)
383
# TODO: jam 20070417 Since this is being cached, should we be returning
385
# I would rather not, and instead just declare that users should not
386
# modify the return value.
389
def _gen_revno_map(self):
390
"""Create a new mapping from revision ids to dotted revnos.
392
Dotted revnos are generated based on the current tip in the revision
394
This is the worker function for get_revision_id_to_revno_map, which
395
just caches the return value.
397
:return: A dictionary mapping revision_id => dotted revno.
399
revision_id_to_revno = dict((rev_id, revno)
400
for rev_id, depth, revno, end_of_merge
401
in self.iter_merge_sorted_revisions())
402
return revision_id_to_revno
405
def iter_merge_sorted_revisions(self, start_revision_id=None,
406
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
407
"""Walk the revisions for a branch in merge sorted order.
409
Merge sorted order is the output from a merge-aware,
410
topological sort, i.e. all parents come before their
411
children going forward; the opposite for reverse.
413
:param start_revision_id: the revision_id to begin walking from.
414
If None, the branch tip is used.
415
:param stop_revision_id: the revision_id to terminate the walk
416
after. If None, the rest of history is included.
417
:param stop_rule: if stop_revision_id is not None, the precise rule
418
to use for termination:
419
* 'exclude' - leave the stop revision out of the result (default)
420
* 'include' - the stop revision is the last item in the result
421
* 'with-merges' - include the stop revision and all of its
422
merged revisions in the result
423
:param direction: either 'reverse' or 'forward':
424
* reverse means return the start_revision_id first, i.e.
425
start at the most recent revision and go backwards in history
426
* forward returns tuples in the opposite order to reverse.
427
Note in particular that forward does *not* do any intelligent
428
ordering w.r.t. depth as some clients of this API may like.
429
(If required, that ought to be done at higher layers.)
431
:return: an iterator over (revision_id, depth, revno, end_of_merge)
434
* revision_id: the unique id of the revision
435
* depth: How many levels of merging deep this node has been
437
* revno_sequence: This field provides a sequence of
438
revision numbers for all revisions. The format is:
439
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
440
branch that the revno is on. From left to right the REVNO numbers
441
are the sequence numbers within that branch of the revision.
442
* end_of_merge: When True the next node (earlier in history) is
443
part of a different merge.
445
# Note: depth and revno values are in the context of the branch so
446
# we need the full graph to get stable numbers, regardless of the
448
if self._merge_sorted_revisions_cache is None:
449
last_revision = self.last_revision()
450
last_key = (last_revision,)
451
known_graph = self.repository.revisions.get_known_graph_ancestry(
453
self._merge_sorted_revisions_cache = known_graph.merge_sort(
455
filtered = self._filter_merge_sorted_revisions(
456
self._merge_sorted_revisions_cache, start_revision_id,
457
stop_revision_id, stop_rule)
458
if direction == 'reverse':
460
if direction == 'forward':
461
return reversed(list(filtered))
463
raise ValueError('invalid direction %r' % direction)
465
def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
466
start_revision_id, stop_revision_id, stop_rule):
467
"""Iterate over an inclusive range of sorted revisions."""
468
rev_iter = iter(merge_sorted_revisions)
469
if start_revision_id is not None:
470
for node in rev_iter:
471
rev_id = node.key[-1]
472
if rev_id != start_revision_id:
475
# The decision to include the start or not
476
# depends on the stop_rule if a stop is provided
477
# so pop this node back into the iterator
478
rev_iter = chain(iter([node]), rev_iter)
480
if stop_revision_id is None:
482
for node in rev_iter:
483
rev_id = node.key[-1]
484
yield (rev_id, node.merge_depth, node.revno,
486
elif stop_rule == 'exclude':
487
for node in rev_iter:
488
rev_id = node.key[-1]
489
if rev_id == stop_revision_id:
491
yield (rev_id, node.merge_depth, node.revno,
493
elif stop_rule == 'include':
494
for node in rev_iter:
495
rev_id = node.key[-1]
496
yield (rev_id, node.merge_depth, node.revno,
498
if rev_id == stop_revision_id:
500
elif stop_rule == 'with-merges':
501
stop_rev = self.repository.get_revision(stop_revision_id)
502
if stop_rev.parent_ids:
503
left_parent = stop_rev.parent_ids[0]
505
left_parent = _mod_revision.NULL_REVISION
506
# left_parent is the actual revision we want to stop logging at,
507
# since we want to show the merged revisions after the stop_rev too
508
reached_stop_revision_id = False
509
revision_id_whitelist = []
510
for node in rev_iter:
511
rev_id = node.key[-1]
512
if rev_id == left_parent:
513
# reached the left parent after the stop_revision
515
if (not reached_stop_revision_id or
516
rev_id in revision_id_whitelist):
517
yield (rev_id, node.merge_depth, node.revno,
519
if reached_stop_revision_id or rev_id == stop_revision_id:
520
# only do the merged revs of rev_id from now on
521
rev = self.repository.get_revision(rev_id)
523
reached_stop_revision_id = True
524
revision_id_whitelist.extend(rev.parent_ids)
526
raise ValueError('invalid stop_rule %r' % stop_rule)
528
def leave_lock_in_place(self):
529
"""Tell this branch object not to release the physical lock when this
532
If lock_write doesn't return a token, then this method is not supported.
534
self.control_files.leave_in_place()
536
def dont_leave_lock_in_place(self):
537
"""Tell this branch object to release the physical lock when this
538
object is unlocked, even if it didn't originally acquire it.
540
If lock_write doesn't return a token, then this method is not supported.
542
self.control_files.dont_leave_in_place()
169
raise NotImplementedError('get_physical_lock_status is abstract')
171
def abspath(self, name):
172
"""Return absolute filename for something in the branch
174
XXX: Robert Collins 20051017 what is this used for? why is it a branch
175
method and not a tree method.
177
raise NotImplementedError('abspath is abstract')
544
179
def bind(self, other):
545
180
"""Bind the local branch the other branch.
640
263
The delta is relative to its mainline predecessor, or the
641
264
empty tree for revision 1.
266
assert isinstance(revno, int)
643
267
rh = self.revision_history()
644
268
if not (1 <= revno <= len(rh)):
645
raise errors.InvalidRevisionNumber(revno)
269
raise InvalidRevisionNumber(revno)
646
270
return self.repository.get_revision_delta(rh[revno-1])
648
def get_stacked_on_url(self):
649
"""Get the URL this branch is stacked against.
651
:raises NotStacked: If the branch is not stacked.
652
:raises UnstackableBranchFormat: If the branch does not support
655
raise NotImplementedError(self.get_stacked_on_url)
272
def get_root_id(self):
273
"""Return the id of this branches root"""
274
raise NotImplementedError('get_root_id is abstract')
657
276
def print_file(self, file, revision_id):
658
277
"""Print `file` to stdout."""
659
raise NotImplementedError(self.print_file)
278
raise NotImplementedError('print_file is abstract')
280
def append_revision(self, *revision_ids):
281
raise NotImplementedError('append_revision is abstract')
661
283
def set_revision_history(self, rev_history):
662
raise NotImplementedError(self.set_revision_history)
665
def set_parent(self, url):
666
"""See Branch.set_parent."""
667
# TODO: Maybe delete old location files?
668
# URLs should never be unicode, even on the local fs,
669
# FIXUP this and get_parent in a future branch format bump:
670
# read and rewrite the file. RBC 20060125
672
if isinstance(url, unicode):
674
url = url.encode('ascii')
675
except UnicodeEncodeError:
676
raise errors.InvalidURL(url,
677
"Urls must be 7-bit ascii, "
678
"use bzrlib.urlutils.escape")
679
url = urlutils.relative_url(self.base, url)
680
self._set_parent_location(url)
683
def set_stacked_on_url(self, url):
684
"""Set the URL this branch is stacked against.
686
:raises UnstackableBranchFormat: If the branch does not support
688
:raises UnstackableRepositoryFormat: If the repository does not support
691
if not self._format.supports_stacking():
692
raise errors.UnstackableBranchFormat(self._format, self.base)
693
# XXX: Changing from one fallback repository to another does not check
694
# that all the data you need is present in the new fallback.
695
# Possibly it should.
696
self._check_stackable_repo()
699
old_url = self.get_stacked_on_url()
700
except (errors.NotStacked, errors.UnstackableBranchFormat,
701
errors.UnstackableRepositoryFormat):
705
self._activate_fallback_location(url)
706
# write this out after the repository is stacked to avoid setting a
707
# stacked config that doesn't work.
708
self._set_config_location('stacked_on_location', url)
711
"""Change a branch to be unstacked, copying data as needed.
713
Don't call this directly, use set_stacked_on_url(None).
715
pb = ui.ui_factory.nested_progress_bar()
717
pb.update("Unstacking")
718
# The basic approach here is to fetch the tip of the branch,
719
# including all available ghosts, from the existing stacked
720
# repository into a new repository object without the fallbacks.
722
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
723
# correct for CHKMap repostiories
724
old_repository = self.repository
725
if len(old_repository._fallback_repositories) != 1:
726
raise AssertionError("can't cope with fallback repositories "
727
"of %r" % (self.repository,))
728
# unlock it, including unlocking the fallback
729
old_repository.unlock()
730
old_repository.lock_read()
732
# Repositories don't offer an interface to remove fallback
733
# repositories today; take the conceptually simpler option and just
734
# reopen it. We reopen it starting from the URL so that we
735
# get a separate connection for RemoteRepositories and can
736
# stream from one of them to the other. This does mean doing
737
# separate SSH connection setup, but unstacking is not a
738
# common operation so it's tolerable.
739
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
740
new_repository = new_bzrdir.find_repository()
741
self.repository = new_repository
742
if self.repository._fallback_repositories:
743
raise AssertionError("didn't expect %r to have "
744
"fallback_repositories"
745
% (self.repository,))
746
# this is not paired with an unlock because it's just restoring
747
# the previous state; the lock's released when set_stacked_on_url
749
self.repository.lock_write()
750
# XXX: If you unstack a branch while it has a working tree
751
# with a pending merge, the pending-merged revisions will no
752
# longer be present. You can (probably) revert and remerge.
754
# XXX: This only fetches up to the tip of the repository; it
755
# doesn't bring across any tags. That's fairly consistent
756
# with how branch works, but perhaps not ideal.
757
self.repository.fetch(old_repository,
758
revision_id=self.last_revision(),
761
old_repository.unlock()
765
def _set_tags_bytes(self, bytes):
766
"""Mirror method for _get_tags_bytes.
768
:seealso: Branch._get_tags_bytes.
770
return _run_with_write_locked_target(self, self._transport.put_bytes,
773
def _cache_revision_history(self, rev_history):
774
"""Set the cached revision history to rev_history.
776
The revision_history method will use this cache to avoid regenerating
777
the revision history.
779
This API is semi-public; it only for use by subclasses, all other code
780
should consider it to be private.
782
self._revision_history_cache = rev_history
784
def _cache_revision_id_to_revno(self, revision_id_to_revno):
785
"""Set the cached revision_id => revno map to revision_id_to_revno.
787
This API is semi-public; it only for use by subclasses, all other code
788
should consider it to be private.
790
self._revision_id_to_revno_cache = revision_id_to_revno
792
def _clear_cached_state(self):
793
"""Clear any cached data on this branch, e.g. cached revision history.
795
This means the next call to revision_history will need to call
796
_gen_revision_history.
798
This API is semi-public; it only for use by subclasses, all other code
799
should consider it to be private.
801
self._revision_history_cache = None
802
self._revision_id_to_revno_cache = None
803
self._last_revision_info_cache = None
804
self._merge_sorted_revisions_cache = None
805
self._partial_revision_history_cache = []
806
self._partial_revision_id_to_revno_cache = {}
808
def _gen_revision_history(self):
809
"""Return sequence of revision hashes on to this branch.
811
Unlike revision_history, this method always regenerates or rereads the
812
revision history, i.e. it does not cache the result, so repeated calls
815
Concrete subclasses should override this instead of revision_history so
816
that subclasses do not need to deal with caching logic.
818
This API is semi-public; it only for use by subclasses, all other code
819
should consider it to be private.
821
raise NotImplementedError(self._gen_revision_history)
284
raise NotImplementedError('set_revision_history is abstract')
824
286
def revision_history(self):
825
"""Return sequence of revision ids on this branch.
827
This method will cache the revision history for as long as it is safe to
830
if 'evil' in debug.debug_flags:
831
mutter_callsite(3, "revision_history scales with history.")
832
if self._revision_history_cache is not None:
833
history = self._revision_history_cache
835
history = self._gen_revision_history()
836
self._cache_revision_history(history)
287
"""Return sequence of revision hashes on to this branch."""
288
raise NotImplementedError('revision_history is abstract')
840
291
"""Return current revision number for this branch.
884
320
common_index = min(self_len, other_len) -1
885
321
if common_index >= 0 and \
886
322
self_history[common_index] != other_history[common_index]:
887
raise errors.DivergedBranches(self, other)
323
raise DivergedBranches(self, other)
889
325
if stop_revision is None:
890
326
stop_revision = other_len
328
assert isinstance(stop_revision, int)
892
329
if stop_revision > other_len:
893
330
raise errors.NoSuchRevision(self, stop_revision)
894
331
return other_history[self_len:stop_revision]
897
def update_revisions(self, other, stop_revision=None, overwrite=False,
333
def update_revisions(self, other, stop_revision=None):
899
334
"""Pull in new perfect-fit revisions.
901
336
:param other: Another Branch to pull from
902
337
:param stop_revision: Updated until the given revision
903
:param overwrite: Always set the branch pointer, rather than checking
904
to see if it is a proper descendant.
905
:param graph: A Graph object that can be used to query history
906
information. This can be None.
909
return InterBranch.get(other, self).update_revisions(stop_revision,
912
def import_last_revision_info(self, source_repo, revno, revid):
913
"""Set the last revision info, importing from another repo if necessary.
915
This is used by the bound branch code to upload a revision to
916
the master branch first before updating the tip of the local branch.
918
:param source_repo: Source repository to optionally fetch from
919
:param revno: Revision number of the new tip
920
:param revid: Revision id of the new tip
922
if not self.repository.has_same_location(source_repo):
923
self.repository.fetch(source_repo, revision_id=revid)
924
self.set_last_revision_info(revno, revid)
340
raise NotImplementedError('update_revisions is abstract')
926
342
def revision_id_to_revno(self, revision_id):
927
343
"""Given a revision id, return its revno"""
928
if _mod_revision.is_null(revision_id):
344
if revision_id is None:
930
346
history = self.revision_history()
932
348
return history.index(revision_id) + 1
933
349
except ValueError:
934
raise errors.NoSuchRevision(self, revision_id)
350
raise bzrlib.errors.NoSuchRevision(self, revision_id)
937
352
def get_rev_id(self, revno, history=None):
938
353
"""Find the revision id of the specified revno."""
940
return _mod_revision.NULL_REVISION
941
last_revno, last_revid = self.last_revision_info()
942
if revno == last_revno:
944
if revno <= 0 or revno > last_revno:
945
raise errors.NoSuchRevision(self, revno)
946
distance_from_last = last_revno - revno
947
if len(self._partial_revision_history_cache) <= distance_from_last:
948
self._extend_partial_history(distance_from_last)
949
return self._partial_revision_history_cache[distance_from_last]
952
def pull(self, source, overwrite=False, stop_revision=None,
953
possible_transports=None, *args, **kwargs):
954
"""Mirror source into this branch.
956
This branch is considered to be 'local', having low latency.
958
:returns: PullResult instance
960
return InterBranch.get(source, self).pull(overwrite=overwrite,
961
stop_revision=stop_revision,
962
possible_transports=possible_transports, *args, **kwargs)
964
def push(self, target, overwrite=False, stop_revision=None, *args,
966
"""Mirror this branch into target.
968
This branch is considered to be 'local', having low latency.
970
return InterBranch.get(self, target).push(overwrite, stop_revision,
973
def lossy_push(self, target, stop_revision=None):
974
"""Push deltas into another branch.
976
:note: This does not, like push, retain the revision ids from
977
the source branch and will, rather than adding bzr-specific
978
metadata, push only those semantics of the revision that can be
979
natively represented by this branch' VCS.
981
:param target: Target branch
982
:param stop_revision: Revision to push, defaults to last revision.
983
:return: BranchPushResult with an extra member revidmap:
984
A dictionary mapping revision ids from the target branch
985
to new revision ids in the target branch, for each
986
revision that was pushed.
988
inter = InterBranch.get(self, target)
989
lossy_push = getattr(inter, "lossy_push", None)
990
if lossy_push is None:
991
raise errors.LossyPushToSameVCS(self, target)
992
return lossy_push(stop_revision)
357
history = self.revision_history()
358
elif revno <= 0 or revno > len(history):
359
raise bzrlib.errors.NoSuchRevision(self, revno)
360
return history[revno - 1]
362
def pull(self, source, overwrite=False, stop_revision=None):
363
raise NotImplementedError('pull is abstract')
994
365
def basis_tree(self):
995
"""Return `Tree` object for last revision."""
366
"""Return `Tree` object for last revision.
368
If there are no revisions yet, return an `EmptyTree`.
996
370
return self.repository.revision_tree(self.last_revision())
372
def rename_one(self, from_rel, to_rel):
375
This can change the directory or the filename or both.
377
raise NotImplementedError('rename_one is abstract')
379
def move(self, from_paths, to_name):
382
to_name must exist as a versioned directory.
384
If to_name exists and is a directory, the files are moved into
385
it, keeping their old names. If it is a directory,
387
Note that to_name is only the last component of the new name;
388
this doesn't change the directory.
390
This returns a list of (from_path, to_path) pairs for each
393
raise NotImplementedError('move is abstract')
998
395
def get_parent(self):
999
396
"""Return the parent location of the branch.
1001
This is the default location for pull/missing. The usual
398
This is the default location for push/pull/missing. The usual
1002
399
pattern is that the user can override it by specifying a
1005
parent = self._get_parent_location()
1008
# This is an old-format absolute path to a local branch
1009
# turn it into a url
1010
if parent.startswith('/'):
1011
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1013
return urlutils.join(self.base[:-1], parent)
1014
except errors.InvalidURLJoin, e:
1015
raise errors.InaccessibleParent(parent, self.base)
1017
def _get_parent_location(self):
1018
raise NotImplementedError(self._get_parent_location)
1020
def _set_config_location(self, name, url, config=None,
1021
make_relative=False):
1023
config = self.get_config()
1027
url = urlutils.relative_url(self.base, url)
1028
config.set_user_option(name, url, warn_masked=True)
1030
def _get_config_location(self, name, config=None):
1032
config = self.get_config()
1033
location = config.get_user_option(name)
1038
def get_child_submit_format(self):
1039
"""Return the preferred format of submissions to this branch."""
1040
return self.get_config().get_user_option("child_submit_format")
402
raise NotImplementedError('get_parent is abstract')
1042
404
def get_submit_branch(self):
1043
405
"""Return the submit location of the branch.
1122
447
self.check_real_revno(revno)
1124
449
def check_real_revno(self, revno):
1126
451
Check whether a revno corresponds to a real revision.
1127
452
Zero (the NULL revision) is considered invalid
1129
454
if revno < 1 or revno > self.revno():
1130
raise errors.InvalidRevisionNumber(revno)
455
raise InvalidRevisionNumber(revno)
1132
457
@needs_read_lock
1133
def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
458
def clone(self, *args, **kwargs):
1134
459
"""Clone this branch into to_bzrdir preserving all semantic values.
1136
Most API users will want 'create_clone_on_transport', which creates a
1137
new bzrdir and branch on the fly.
1139
461
revision_id: if not None, the revision history in the new branch will
1140
462
be truncated to end with revision_id.
1142
result = to_bzrdir.create_branch()
1145
if repository_policy is not None:
1146
repository_policy.configure_branch(result)
1147
self.copy_content_into(result, revision_id=revision_id)
464
# for API compatibility, until 0.8 releases we provide the old api:
465
# def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
466
# after 0.8 releases, the *args and **kwargs should be changed:
467
# def clone(self, to_bzrdir, revision_id=None):
468
if (kwargs.get('to_location', None) or
469
kwargs.get('revision', None) or
470
kwargs.get('basis_branch', None) or
471
(len(args) and isinstance(args[0], basestring))):
472
# backwards compatibility api:
473
warn("Branch.clone() has been deprecated for BzrDir.clone() from"
474
" bzrlib 0.8.", DeprecationWarning, stacklevel=3)
477
basis_branch = args[2]
479
basis_branch = kwargs.get('basis_branch', None)
481
basis = basis_branch.bzrdir
486
revision_id = args[1]
488
revision_id = kwargs.get('revision', None)
493
# no default to raise if not provided.
494
url = kwargs.get('to_location')
495
return self.bzrdir.clone(url,
496
revision_id=revision_id,
497
basis=basis).open_branch()
499
# generate args by hand
501
revision_id = args[1]
503
revision_id = kwargs.get('revision_id', None)
507
# no default to raise if not provided.
508
to_bzrdir = kwargs.get('to_bzrdir')
509
result = self._format.initialize(to_bzrdir)
510
self.copy_content_into(result, revision_id=revision_id)
1152
513
@needs_read_lock
1153
def sprout(self, to_bzrdir, revision_id=None, repository_policy=None):
514
def sprout(self, to_bzrdir, revision_id=None):
1154
515
"""Create a new line of development from the branch, into to_bzrdir.
1156
to_bzrdir controls the branch format.
1158
517
revision_id: if not None, the revision history in the new branch will
1159
518
be truncated to end with revision_id.
1161
if (repository_policy is not None and
1162
repository_policy.requires_stacking()):
1163
to_bzrdir._format.require_stacking(_skip_repo=True)
1164
result = to_bzrdir.create_branch()
1167
if repository_policy is not None:
1168
repository_policy.configure_branch(result)
1169
self.copy_content_into(result, revision_id=revision_id)
1170
result.set_parent(self.bzrdir.root_transport.base)
520
result = self._format.initialize(to_bzrdir)
521
self.copy_content_into(result, revision_id=revision_id)
522
result.set_parent(self.bzrdir.root_transport.base)
1175
def _synchronize_history(self, destination, revision_id):
1176
"""Synchronize last revision and revision history between branches.
1178
This version is most efficient when the destination is also a
1179
BzrBranch6, but works for BzrBranch5, as long as the destination's
1180
repository contains all the lefthand ancestors of the intended
1181
last_revision. If not, set_last_revision_info will fail.
1183
:param destination: The branch to copy the history into
1184
:param revision_id: The revision-id to truncate history at. May
1185
be None to copy complete history.
1187
source_revno, source_revision_id = self.last_revision_info()
1188
if revision_id is None:
1189
revno, revision_id = source_revno, source_revision_id
1191
graph = self.repository.get_graph()
1193
revno = graph.find_distance_to_null(revision_id,
1194
[(source_revision_id, source_revno)])
1195
except errors.GhostRevisionsHaveNoRevno:
1196
# Default to 1, if we can't find anything else
1198
destination.set_last_revision_info(revno, revision_id)
1200
525
@needs_read_lock
1201
526
def copy_content_into(self, destination, revision_id=None):
1202
527
"""Copy the content of self into destination.
1204
529
revision_id: if not None, the revision history in the new branch will
1205
530
be truncated to end with revision_id.
1207
self.update_references(destination)
1208
self._synchronize_history(destination, revision_id)
1210
parent = self.get_parent()
1211
except errors.InaccessibleParent, e:
1212
mutter('parent was not accessible to copy: %s', e)
1215
destination.set_parent(parent)
1216
if self._push_should_merge_tags():
1217
self.tags.merge_to(destination.tags)
1219
def update_references(self, target):
1220
if not getattr(self._format, 'supports_reference_locations', False):
1222
reference_dict = self._get_all_reference_info()
1223
if len(reference_dict) == 0:
1225
old_base = self.base
1226
new_base = target.base
1227
target_reference_dict = target._get_all_reference_info()
1228
for file_id, (tree_path, branch_location) in (
1229
reference_dict.items()):
1230
branch_location = urlutils.rebase_url(branch_location,
1232
target_reference_dict.setdefault(
1233
file_id, (tree_path, branch_location))
1234
target._set_all_reference_info(target_reference_dict)
532
new_history = self.revision_history()
533
if revision_id is not None:
535
new_history = new_history[:new_history.index(revision_id) + 1]
537
rev = self.repository.get_revision(revision_id)
538
new_history = rev.get_history(self.repository)[1:]
539
destination.set_revision_history(new_history)
540
parent = self.get_parent()
542
destination.set_parent(parent)
1236
544
@needs_read_lock
1237
def check(self, refs):
1238
546
"""Check consistency of the branch.
1240
548
In particular this checks that revisions given in the revision-history
1241
do actually match up in the revision graph, and that they're all
549
do actually match up in the revision graph, and that they're all
1242
550
present in the repository.
1244
552
Callers will typically also want to check the repository.
1246
:param refs: Calculated refs for this branch as specified by
1247
branch._get_check_refs()
1248
554
:return: A BranchCheckResult.
1250
result = BranchCheckResult(self)
1251
last_revno, last_revision_id = self.last_revision_info()
1252
actual_revno = refs[('lefthand-distance', last_revision_id)]
1253
if actual_revno != last_revno:
1254
result.errors.append(errors.BzrCheckError(
1255
'revno does not match len(mainline) %s != %s' % (
1256
last_revno, actual_revno)))
1257
# TODO: We should probably also check that self.revision_history
1258
# matches the repository for older branch formats.
1259
# If looking for the code that cross-checks repository parents against
1260
# the iter_reverse_revision_history output, that is now a repository
1264
def _get_checkout_format(self):
1265
"""Return the most suitable metadir for a checkout of this branch.
1266
Weaves are used if this branch's repository uses weaves.
1268
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
1269
from bzrlib.repofmt import weaverepo
1270
format = bzrdir.BzrDirMetaFormat1()
1271
format.repository_format = weaverepo.RepositoryFormat7()
1273
format = self.repository.bzrdir.checkout_metadir()
1274
format.set_branch_format(self._format)
1277
def create_clone_on_transport(self, to_transport, revision_id=None,
1278
stacked_on=None, create_prefix=False, use_existing_dir=False):
1279
"""Create a clone of this branch and its bzrdir.
1281
:param to_transport: The transport to clone onto.
1282
:param revision_id: The revision id to use as tip in the new branch.
1283
If None the tip is obtained from this branch.
1284
:param stacked_on: An optional URL to stack the clone on.
1285
:param create_prefix: Create any missing directories leading up to
1287
:param use_existing_dir: Use an existing directory if one exists.
1289
# XXX: Fix the bzrdir API to allow getting the branch back from the
1290
# clone call. Or something. 20090224 RBC/spiv.
1291
if revision_id is None:
1292
revision_id = self.last_revision()
1293
dir_to = self.bzrdir.clone_on_transport(to_transport,
1294
revision_id=revision_id, stacked_on=stacked_on,
1295
create_prefix=create_prefix, use_existing_dir=use_existing_dir)
1296
return dir_to.open_branch()
1298
def create_checkout(self, to_location, revision_id=None,
1299
lightweight=False, accelerator_tree=None,
1301
"""Create a checkout of a branch.
1303
:param to_location: The url to produce the checkout at
1304
:param revision_id: The revision to check out
1305
:param lightweight: If True, produce a lightweight checkout, otherwise,
1306
produce a bound branch (heavyweight checkout)
1307
:param accelerator_tree: A tree which can be used for retrieving file
1308
contents more quickly than the revision tree, i.e. a workingtree.
1309
The revision tree will be used for cases where accelerator_tree's
1310
content is different.
1311
:param hardlink: If true, hard-link files from accelerator_tree,
1313
:return: The tree of the created checkout
1315
t = transport.get_transport(to_location)
1318
format = self._get_checkout_format()
1319
checkout = format.initialize_on_transport(t)
1320
from_branch = BranchReferenceFormat().initialize(checkout, self)
1322
format = self._get_checkout_format()
1323
checkout_branch = bzrdir.BzrDir.create_branch_convenience(
1324
to_location, force_new_tree=False, format=format)
1325
checkout = checkout_branch.bzrdir
1326
checkout_branch.bind(self)
1327
# pull up to the specified revision_id to set the initial
1328
# branch tip correctly, and seed it with history.
1329
checkout_branch.pull(self, stop_revision=revision_id)
1331
tree = checkout.create_workingtree(revision_id,
1332
from_branch=from_branch,
1333
accelerator_tree=accelerator_tree,
1335
basis_tree = tree.basis_tree()
1336
basis_tree.lock_read()
1338
for path, file_id in basis_tree.iter_references():
1339
reference_parent = self.reference_parent(file_id, path)
1340
reference_parent.create_checkout(tree.abspath(path),
1341
basis_tree.get_reference_revision(file_id, path),
1348
def reconcile(self, thorough=True):
1349
"""Make sure the data stored in this branch is consistent."""
1350
from bzrlib.reconcile import BranchReconciler
1351
reconciler = BranchReconciler(self, thorough=thorough)
1352
reconciler.reconcile()
1355
def reference_parent(self, file_id, path, possible_transports=None):
1356
"""Return the parent branch for a tree-reference file_id
1357
:param file_id: The file_id of the tree reference
1358
:param path: The path of the file_id in the tree
1359
:return: A branch associated with the file_id
1361
# FIXME should provide multiple branches, based on config
1362
return Branch.open(self.bzrdir.root_transport.clone(path).base,
1363
possible_transports=possible_transports)
1365
def supports_tags(self):
1366
return self._format.supports_tags()
1368
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1370
"""Ensure that revision_b is a descendant of revision_a.
1372
This is a helper function for update_revisions.
1374
:raises: DivergedBranches if revision_b has diverged from revision_a.
1375
:returns: True if revision_b is a descendant of revision_a.
1377
relation = self._revision_relations(revision_a, revision_b, graph)
1378
if relation == 'b_descends_from_a':
1380
elif relation == 'diverged':
1381
raise errors.DivergedBranches(self, other_branch)
1382
elif relation == 'a_descends_from_b':
1385
raise AssertionError("invalid relation: %r" % (relation,))
1387
def _revision_relations(self, revision_a, revision_b, graph):
1388
"""Determine the relationship between two revisions.
1390
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1392
heads = graph.heads([revision_a, revision_b])
1393
if heads == set([revision_b]):
1394
return 'b_descends_from_a'
1395
elif heads == set([revision_a, revision_b]):
1396
# These branches have diverged
1398
elif heads == set([revision_a]):
1399
return 'a_descends_from_b'
1401
raise AssertionError("invalid heads: %r" % (heads,))
556
mainline_parent_id = None
557
for revision_id in self.revision_history():
559
revision = self.repository.get_revision(revision_id)
560
except errors.NoSuchRevision, e:
561
raise errors.BzrCheckError("mainline revision {%s} not in repository"
563
# In general the first entry on the revision history has no parents.
564
# But it's not illegal for it to have parents listed; this can happen
565
# in imports from Arch when the parents weren't reachable.
566
if mainline_parent_id is not None:
567
if mainline_parent_id not in revision.parent_ids:
568
raise errors.BzrCheckError("previous revision {%s} not listed among "
570
% (mainline_parent_id, revision_id))
571
mainline_parent_id = revision_id
572
return BranchCheckResult(self)
1404
575
class BranchFormat(object):
1426
597
"""The known formats."""
1428
can_set_append_revisions_only = True
1430
def __eq__(self, other):
1431
return self.__class__ is other.__class__
1433
def __ne__(self, other):
1434
return not (self == other)
1437
600
def find_format(klass, a_bzrdir):
1438
601
"""Return the format for the branch object in a_bzrdir."""
1440
603
transport = a_bzrdir.get_branch_transport(None)
1441
format_string = transport.get_bytes("format")
604
format_string = transport.get("format").read()
1442
605
return klass._formats[format_string]
1443
except errors.NoSuchFile:
1444
raise errors.NotBranchError(path=transport.base)
607
raise NotBranchError(path=transport.base)
1445
608
except KeyError:
1446
raise errors.UnknownFormatError(format=format_string, kind='branch')
609
raise errors.UnknownFormatError(format=format_string)
1449
612
def get_default_format(klass):
1450
613
"""Return the current default format."""
1451
614
return klass._default_format
1453
def get_reference(self, a_bzrdir):
1454
"""Get the target reference of the branch in a_bzrdir.
1456
format probing must have been completed before calling
1457
this method - it is assumed that the format of the branch
1458
in a_bzrdir is correct.
1460
:param a_bzrdir: The bzrdir to get the branch data from.
1461
:return: None if the branch is not a reference branch.
1466
def set_reference(self, a_bzrdir, to_branch):
1467
"""Set the target reference of the branch in a_bzrdir.
1469
format probing must have been completed before calling
1470
this method - it is assumed that the format of the branch
1471
in a_bzrdir is correct.
1473
:param a_bzrdir: The bzrdir to set the branch reference for.
1474
:param to_branch: branch that the checkout is to reference
1476
raise NotImplementedError(self.set_reference)
1478
616
def get_format_string(self):
1479
617
"""Return the ASCII format string that identifies this format."""
1480
618
raise NotImplementedError(self.get_format_string)
1482
620
def get_format_description(self):
1483
621
"""Return the short format description for this format."""
1484
raise NotImplementedError(self.get_format_description)
1486
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1488
"""Initialize a branch in a bzrdir, with specified files
1490
:param a_bzrdir: The bzrdir to initialize the branch in
1491
:param utf8_files: The files to create as a list of
1492
(filename, content) tuples
1493
:param set_format: If True, set the format with
1494
self.get_format_string. (BzrBranch4 has its format set
1496
:return: a branch in this format
1498
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1499
branch_transport = a_bzrdir.get_branch_transport(self)
1501
'metadir': ('lock', lockdir.LockDir),
1502
'branch4': ('branch-lock', lockable_files.TransportLock),
1504
lock_name, lock_class = lock_map[lock_type]
1505
control_files = lockable_files.LockableFiles(branch_transport,
1506
lock_name, lock_class)
1507
control_files.create_lock()
1509
control_files.lock_write()
1510
except errors.LockContention:
1511
if lock_type != 'branch4':
1517
utf8_files += [('format', self.get_format_string())]
1519
for (filename, content) in utf8_files:
1520
branch_transport.put_bytes(
1522
mode=a_bzrdir._get_file_mode())
1525
control_files.unlock()
1526
return self.open(a_bzrdir, _found=True)
622
raise NotImplementedError(self.get_format_string)
1528
624
def initialize(self, a_bzrdir):
1529
625
"""Create a branch of this format in a_bzrdir."""
1533
629
"""Is this format supported?
1535
631
Supported formats can be initialized and opened.
1536
Unsupported formats may not support initialization or committing or
632
Unsupported formats may not support initialization or committing or
1537
633
some other features depending on the reason for not being supported.
1541
def make_tags(self, branch):
1542
"""Create a tags object for branch.
1544
This method is on BranchFormat, because BranchFormats are reflected
1545
over the wire via network_name(), whereas full Branch instances require
1546
multiple VFS method calls to operate at all.
1548
The default implementation returns a disabled-tags instance.
1550
Note that it is normal for branch to be a RemoteBranch when using tags
1553
return DisabledTags(branch)
1555
def network_name(self):
1556
"""A simple byte string uniquely identifying this format for RPC calls.
1558
MetaDir branch formats use their disk format string to identify the
1559
repository over the wire. All in one formats such as bzr < 0.8, and
1560
foreign formats like svn/git and hg should use some marker which is
1561
unique and immutable.
1563
raise NotImplementedError(self.network_name)
1565
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
637
def open(self, a_bzrdir, _found=False):
1566
638
"""Return the branch object for a_bzrdir
1568
:param a_bzrdir: A BzrDir that contains a branch.
1569
:param _found: a private parameter, do not use it. It is used to
1570
indicate if format probing has already be done.
1571
:param ignore_fallbacks: when set, no fallback branches will be opened
1572
(if there are any). Default is to open fallbacks.
640
_found is a private parameter, do not use it. It is used to indicate
641
if format probing has already be done.
1574
643
raise NotImplementedError(self.open)
1577
646
def register_format(klass, format):
1578
"""Register a metadir format."""
1579
647
klass._formats[format.get_format_string()] = format
1580
# Metadir formats have a network name of their format string, and get
1581
# registered as class factories.
1582
network_format_registry.register(format.get_format_string(), format.__class__)
1585
650
def set_default_format(klass, format):
1586
651
klass._default_format = format
1588
def supports_set_append_revisions_only(self):
1589
"""True if this format supports set_append_revisions_only."""
1592
def supports_stacking(self):
1593
"""True if this format records a stacked-on branch."""
1597
654
def unregister_format(klass, format):
655
assert klass._formats[format.get_format_string()] is format
1598
656
del klass._formats[format.get_format_string()]
1600
658
def __str__(self):
1601
return self.get_format_description().rstrip()
1603
def supports_tags(self):
1604
"""True if this format supports tags stored in the branch"""
1605
return False # by default
1608
class BranchHooks(Hooks):
1609
"""A dictionary mapping hook name to a list of callables for branch hooks.
1611
e.g. ['set_rh'] Is the list of items to be called when the
1612
set_revision_history function is invoked.
1616
"""Create the default hooks.
1618
These are all empty initially, because by default nothing should get
1621
Hooks.__init__(self)
1622
self.create_hook(HookPoint('set_rh',
1623
"Invoked whenever the revision history has been set via "
1624
"set_revision_history. The api signature is (branch, "
1625
"revision_history), and the branch will be write-locked. "
1626
"The set_rh hook can be expensive for bzr to trigger, a better "
1627
"hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1628
self.create_hook(HookPoint('open',
1629
"Called with the Branch object that has been opened after a "
1630
"branch is opened.", (1, 8), None))
1631
self.create_hook(HookPoint('post_push',
1632
"Called after a push operation completes. post_push is called "
1633
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1634
"bzr client.", (0, 15), None))
1635
self.create_hook(HookPoint('post_pull',
1636
"Called after a pull operation completes. post_pull is called "
1637
"with a bzrlib.branch.PullResult object and only runs in the "
1638
"bzr client.", (0, 15), None))
1639
self.create_hook(HookPoint('pre_commit',
1640
"Called after a commit is calculated but before it is is "
1641
"completed. pre_commit is called with (local, master, old_revno, "
1642
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1643
"). old_revid is NULL_REVISION for the first commit to a branch, "
1644
"tree_delta is a TreeDelta object describing changes from the "
1645
"basis revision. hooks MUST NOT modify this delta. "
1646
" future_tree is an in-memory tree obtained from "
1647
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1648
"tree.", (0,91), None))
1649
self.create_hook(HookPoint('post_commit',
1650
"Called in the bzr client after a commit has completed. "
1651
"post_commit is called with (local, master, old_revno, old_revid, "
1652
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1653
"commit to a branch.", (0, 15), None))
1654
self.create_hook(HookPoint('post_uncommit',
1655
"Called in the bzr client after an uncommit completes. "
1656
"post_uncommit is called with (local, master, old_revno, "
1657
"old_revid, new_revno, new_revid) where local is the local branch "
1658
"or None, master is the target branch, and an empty branch "
1659
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1660
self.create_hook(HookPoint('pre_change_branch_tip',
1661
"Called in bzr client and server before a change to the tip of a "
1662
"branch is made. pre_change_branch_tip is called with a "
1663
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1664
"commit, uncommit will all trigger this hook.", (1, 6), None))
1665
self.create_hook(HookPoint('post_change_branch_tip',
1666
"Called in bzr client and server after a change to the tip of a "
1667
"branch is made. post_change_branch_tip is called with a "
1668
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1669
"commit, uncommit will all trigger this hook.", (1, 4), None))
1670
self.create_hook(HookPoint('transform_fallback_location',
1671
"Called when a stacked branch is activating its fallback "
1672
"locations. transform_fallback_location is called with (branch, "
1673
"url), and should return a new url. Returning the same url "
1674
"allows it to be used as-is, returning a different one can be "
1675
"used to cause the branch to stack on a closer copy of that "
1676
"fallback_location. Note that the branch cannot have history "
1677
"accessing methods called on it during this hook because the "
1678
"fallback locations have not been activated. When there are "
1679
"multiple hooks installed for transform_fallback_location, "
1680
"all are called with the url returned from the previous hook."
1681
"The order is however undefined.", (1, 9), None))
1684
# install the default hooks into the Branch class.
1685
Branch.hooks = BranchHooks()
1688
class ChangeBranchTipParams(object):
1689
"""Object holding parameters passed to *_change_branch_tip hooks.
1691
There are 5 fields that hooks may wish to access:
1693
:ivar branch: the branch being changed
1694
:ivar old_revno: revision number before the change
1695
:ivar new_revno: revision number after the change
1696
:ivar old_revid: revision id before the change
1697
:ivar new_revid: revision id after the change
1699
The revid fields are strings. The revno fields are integers.
1702
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1703
"""Create a group of ChangeBranchTip parameters.
1705
:param branch: The branch being changed.
1706
:param old_revno: Revision number before the change.
1707
:param new_revno: Revision number after the change.
1708
:param old_revid: Tip revision id before the change.
1709
:param new_revid: Tip revision id after the change.
1711
self.branch = branch
1712
self.old_revno = old_revno
1713
self.new_revno = new_revno
1714
self.old_revid = old_revid
1715
self.new_revid = new_revid
1717
def __eq__(self, other):
1718
return self.__dict__ == other.__dict__
1721
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1722
self.__class__.__name__, self.branch,
1723
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
659
return self.get_format_string().rstrip()
1726
662
class BzrBranchFormat4(BranchFormat):
1830
731
def get_format_description(self):
1831
732
"""See BranchFormat.get_format_description()."""
1832
733
return "Branch format 5"
1834
735
def initialize(self, a_bzrdir):
1835
736
"""Create a branch of this format in a_bzrdir."""
737
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
738
branch_transport = a_bzrdir.get_branch_transport(self)
1836
739
utf8_files = [('revision-history', ''),
1837
740
('branch-name', ''),
1839
return self._initialize_helper(a_bzrdir, utf8_files)
1841
def supports_tags(self):
1845
class BzrBranchFormat6(BranchFormatMetadir):
1846
"""Branch format with last-revision and tags.
1848
Unlike previous formats, this has no explicit revision history. Instead,
1849
this just stores the last-revision, and the left-hand history leading
1850
up to there is the history.
1852
This format was introduced in bzr 0.15
1853
and became the default in 0.91.
1856
def _branch_class(self):
1859
def get_format_string(self):
1860
"""See BranchFormat.get_format_string()."""
1861
return "Bazaar Branch Format 6 (bzr 0.15)\n"
1863
def get_format_description(self):
1864
"""See BranchFormat.get_format_description()."""
1865
return "Branch format 6"
1867
def initialize(self, a_bzrdir):
1868
"""Create a branch of this format in a_bzrdir."""
1869
utf8_files = [('last-revision', '0 null:\n'),
1870
('branch.conf', ''),
1873
return self._initialize_helper(a_bzrdir, utf8_files)
1875
def make_tags(self, branch):
1876
"""See bzrlib.branch.BranchFormat.make_tags()."""
1877
return BasicTags(branch)
1879
def supports_set_append_revisions_only(self):
1883
class BzrBranchFormat8(BranchFormatMetadir):
1884
"""Metadir format supporting storing locations of subtree branches."""
1886
def _branch_class(self):
1889
def get_format_string(self):
1890
"""See BranchFormat.get_format_string()."""
1891
return "Bazaar Branch Format 8 (needs bzr 1.15)\n"
1893
def get_format_description(self):
1894
"""See BranchFormat.get_format_description()."""
1895
return "Branch format 8"
1897
def initialize(self, a_bzrdir):
1898
"""Create a branch of this format in a_bzrdir."""
1899
utf8_files = [('last-revision', '0 null:\n'),
1900
('branch.conf', ''),
1904
return self._initialize_helper(a_bzrdir, utf8_files)
742
control_files = LockableFiles(branch_transport, 'lock', lockdir.LockDir)
743
control_files.create_lock()
744
control_files.lock_write()
745
control_files.put_utf8('format', self.get_format_string())
747
for file, content in utf8_files:
748
control_files.put_utf8(file, content)
750
control_files.unlock()
751
return self.open(a_bzrdir, _found=True, )
1906
753
def __init__(self):
1907
super(BzrBranchFormat8, self).__init__()
1908
self._matchingbzrdir.repository_format = \
1909
RepositoryFormatKnitPack5RichRoot()
1911
def make_tags(self, branch):
1912
"""See bzrlib.branch.BranchFormat.make_tags()."""
1913
return BasicTags(branch)
1915
def supports_set_append_revisions_only(self):
1918
def supports_stacking(self):
1921
supports_reference_locations = True
1924
class BzrBranchFormat7(BzrBranchFormat8):
1925
"""Branch format with last-revision, tags, and a stacked location pointer.
1927
The stacked location pointer is passed down to the repository and requires
1928
a repository format with supports_external_lookups = True.
1930
This format was introduced in bzr 1.6.
1933
def initialize(self, a_bzrdir):
1934
"""Create a branch of this format in a_bzrdir."""
1935
utf8_files = [('last-revision', '0 null:\n'),
1936
('branch.conf', ''),
1939
return self._initialize_helper(a_bzrdir, utf8_files)
1941
def _branch_class(self):
1944
def get_format_string(self):
1945
"""See BranchFormat.get_format_string()."""
1946
return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
1948
def get_format_description(self):
1949
"""See BranchFormat.get_format_description()."""
1950
return "Branch format 7"
1952
def supports_set_append_revisions_only(self):
1955
supports_reference_locations = False
754
super(BzrBranchFormat5, self).__init__()
755
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
757
def open(self, a_bzrdir, _found=False):
758
"""Return the branch object for a_bzrdir
760
_found is a private parameter, do not use it. It is used to indicate
761
if format probing has already be done.
764
format = BranchFormat.find_format(a_bzrdir)
765
assert format.__class__ == self.__class__
766
transport = a_bzrdir.get_branch_transport(None)
767
control_files = LockableFiles(transport, 'lock', lockdir.LockDir)
768
return BzrBranch5(_format=self,
769
_control_files=control_files,
771
_repository=a_bzrdir.find_repository())
774
return "Bazaar-NG Metadir branch format 5"
1958
777
class BranchReferenceFormat(BranchFormat):
2054
network_format_registry = registry.FormatRegistry()
2055
"""Registry of formats indexed by their network name.
2057
The network name for a branch format is an identifier that can be used when
2058
referring to formats with smart server operations. See
2059
BranchFormat.network_name() for more detail.
2063
847
# formats which have no format string are not discoverable
2064
848
# and not independently creatable, so are not registered.
2065
__format5 = BzrBranchFormat5()
2066
__format6 = BzrBranchFormat6()
2067
__format7 = BzrBranchFormat7()
2068
__format8 = BzrBranchFormat8()
2069
BranchFormat.register_format(__format5)
849
__default_format = BzrBranchFormat5()
850
BranchFormat.register_format(__default_format)
2070
851
BranchFormat.register_format(BranchReferenceFormat())
2071
BranchFormat.register_format(__format6)
2072
BranchFormat.register_format(__format7)
2073
BranchFormat.register_format(__format8)
2074
BranchFormat.set_default_format(__format7)
852
BranchFormat.set_default_format(__default_format)
2075
853
_legacy_formats = [BzrBranchFormat4(),
2077
network_format_registry.register(
2078
_legacy_formats[0].network_name(), _legacy_formats[0].__class__)
2081
class BzrBranch(Branch, _RelockDebugMixin):
856
class BzrBranch(Branch):
2082
857
"""A branch stored in the actual filesystem.
2084
859
Note that it's "local" in the context of the filesystem; it doesn't
2085
860
really matter if it's on an nfs/smb/afs/coda/... share, as long as
2086
861
it's writable, and can be accessed via the normal filesystem API.
2088
:ivar _transport: Transport for file operations on this branch's
2089
control files, typically pointing to the .bzr/branch directory.
2090
:ivar repository: Repository for this branch.
2091
:ivar base: The url of the base directory for this branch; the one
2092
containing the .bzr directory.
2095
def __init__(self, _format=None,
2096
_control_files=None, a_bzrdir=None, _repository=None,
2097
ignore_fallbacks=False):
2098
"""Create new branch object at a particular location."""
864
def __init__(self, transport=DEPRECATED_PARAMETER, init=DEPRECATED_PARAMETER,
865
relax_version_check=DEPRECATED_PARAMETER, _format=None,
866
_control_files=None, a_bzrdir=None, _repository=None):
867
"""Create new branch object at a particular location.
869
transport -- A Transport object, defining how to access files.
871
init -- If True, create new control files in a previously
872
unversioned directory. If False, the branch must already
875
relax_version_check -- If true, the usual check for the branch
876
version is not applied. This is intended only for
877
upgrade/recovery type use; it's not guaranteed that
878
all operations will work on old format branches.
2099
880
if a_bzrdir is None:
2100
raise ValueError('a_bzrdir must be supplied')
881
self.bzrdir = bzrdir.BzrDir.open(transport.base)
2102
883
self.bzrdir = a_bzrdir
2103
self._base = self.bzrdir.transport.clone('..').base
2104
# XXX: We should be able to just do
2105
# self.base = self.bzrdir.root_transport.base
2106
# but this does not quite work yet -- mbp 20080522
884
self._transport = self.bzrdir.transport.clone('..')
885
self._base = self._transport.base
2107
886
self._format = _format
2108
887
if _control_files is None:
2109
888
raise ValueError('BzrBranch _control_files is None')
2110
889
self.control_files = _control_files
2111
self._transport = _control_files._transport
890
if deprecated_passed(init):
891
warn("BzrBranch.__init__(..., init=XXX): The init parameter is "
892
"deprecated as of bzr 0.8. Please use Branch.create().",
896
# this is slower than before deprecation, oh well never mind.
898
self._initialize(transport.base)
899
self._check_format(_format)
900
if deprecated_passed(relax_version_check):
901
warn("BzrBranch.__init__(..., relax_version_check=XXX_: The "
902
"relax_version_check parameter is deprecated as of bzr 0.8. "
903
"Please use BzrDir.open_downlevel, or a BzrBranchFormat's "
907
if (not relax_version_check
908
and not self._format.is_supported()):
909
raise errors.UnsupportedFormatError(format=fmt)
910
if deprecated_passed(transport):
911
warn("BzrBranch.__init__(transport=XXX...): The transport "
912
"parameter is deprecated as of bzr 0.8. "
913
"Please use Branch.open, or bzrdir.open_branch().",
2112
916
self.repository = _repository
2113
Branch.__init__(self)
2115
918
def __str__(self):
2116
919
return '%s(%r)' % (self.__class__.__name__, self.base)
2118
921
__repr__ = __str__
924
# TODO: It might be best to do this somewhere else,
925
# but it is nice for a Branch object to automatically
926
# cache it's information.
927
# Alternatively, we could have the Transport objects cache requests
928
# See the earlier discussion about how major objects (like Branch)
929
# should never expect their __del__ function to run.
930
# XXX: cache_root seems to be unused, 2006-01-13 mbp
931
if hasattr(self, 'cache_root') and self.cache_root is not None:
933
osutils.rmtree(self.cache_root)
936
self.cache_root = None
2120
938
def _get_base(self):
2121
"""Returns the directory containing the control directory."""
2122
939
return self._base
2124
941
base = property(_get_base, doc="The URL for the root of this branch.")
2126
def _get_config(self):
2127
return TransportConfig(self._transport, 'branch.conf')
943
def _finish_transaction(self):
944
"""Exit the current transaction."""
945
return self.control_files._finish_transaction()
947
def get_transaction(self):
948
"""Return the current active transaction.
950
If no transaction is active, this returns a passthrough object
951
for which all data is immediately flushed and no caching happens.
953
# this is an explicit function so that we can do tricky stuff
954
# when the storage in rev_storage is elsewhere.
955
# we probably need to hook the two 'lock a location' and
956
# 'have a transaction' together more delicately, so that
957
# we can have two locks (branch and storage) and one transaction
958
# ... and finishing the transaction unlocks both, but unlocking
959
# does not. - RBC 20051121
960
return self.control_files.get_transaction()
962
def _set_transaction(self, transaction):
963
"""Set a new active transaction."""
964
return self.control_files._set_transaction(transaction)
966
def abspath(self, name):
967
"""See Branch.abspath."""
968
return self.control_files._transport.abspath(name)
970
def _check_format(self, format):
971
"""Identify the branch format if needed.
973
The format is stored as a reference to the format object in
974
self._format for code that needs to check it later.
976
The format parameter is either None or the branch format class
977
used to open this branch.
979
FIXME: DELETE THIS METHOD when pre 0.8 support is removed.
982
format = BranchFormat.find_format(self.bzrdir)
983
self._format = format
984
mutter("got branch format %s", self._format)
987
def get_root_id(self):
988
"""See Branch.get_root_id."""
989
tree = self.repository.revision_tree(self.last_revision())
990
return tree.inventory.root.file_id
2129
992
def is_locked(self):
2130
993
return self.control_files.is_locked()
2132
def lock_write(self, token=None):
2133
if not self.is_locked():
2134
self._note_lock('w')
2135
# All-in-one needs to always unlock/lock.
2136
repo_control = getattr(self.repository, 'control_files', None)
2137
if self.control_files == repo_control or not self.is_locked():
2138
self.repository._warn_if_deprecated(self)
2139
self.repository.lock_write()
2144
return self.control_files.lock_write(token=token)
2147
self.repository.unlock()
995
def lock_write(self):
996
# TODO: test for failed two phase locks. This is known broken.
997
self.control_files.lock_write()
998
self.repository.lock_write()
2150
1000
def lock_read(self):
2151
if not self.is_locked():
2152
self._note_lock('r')
2153
# All-in-one needs to always unlock/lock.
2154
repo_control = getattr(self.repository, 'control_files', None)
2155
if self.control_files == repo_control or not self.is_locked():
2156
self.repository._warn_if_deprecated(self)
2157
self.repository.lock_read()
2162
self.control_files.lock_read()
2165
self.repository.unlock()
1001
# TODO: test for failed two phase locks. This is known broken.
1002
self.control_files.lock_read()
1003
self.repository.lock_read()
2168
@only_raises(errors.LockNotHeld, errors.LockBroken)
2169
1005
def unlock(self):
1006
# TODO: test for failed two phase locks. This is known broken.
1008
self.repository.unlock()
2171
1010
self.control_files.unlock()
2173
# All-in-one needs to always unlock/lock.
2174
repo_control = getattr(self.repository, 'control_files', None)
2175
if (self.control_files == repo_control or
2176
not self.control_files.is_locked()):
2177
self.repository.unlock()
2178
if not self.control_files.is_locked():
2179
# we just released the lock
2180
self._clear_cached_state()
2182
1012
def peek_lock_mode(self):
2183
1013
if self.control_files._lock_count == 0:
2193
1023
"""See Branch.print_file."""
2194
1024
return self.repository.print_file(file, revision_id)
2196
def _write_revision_history(self, history):
2197
"""Factored out of set_revision_history.
2199
This performs the actual writing to disk.
2200
It is intended to be called by BzrBranch5.set_revision_history."""
2201
self._transport.put_bytes(
2202
'revision-history', '\n'.join(history),
2203
mode=self.bzrdir._get_file_mode())
1027
def append_revision(self, *revision_ids):
1028
"""See Branch.append_revision."""
1029
for revision_id in revision_ids:
1030
mutter("add {%s} to revision-history" % revision_id)
1031
rev_history = self.revision_history()
1032
rev_history.extend(revision_ids)
1033
self.set_revision_history(rev_history)
2205
1035
@needs_write_lock
2206
1036
def set_revision_history(self, rev_history):
2207
1037
"""See Branch.set_revision_history."""
2208
if 'evil' in debug.debug_flags:
2209
mutter_callsite(3, "set_revision_history scales with history.")
2210
check_not_reserved_id = _mod_revision.check_not_reserved_id
2211
for rev_id in rev_history:
2212
check_not_reserved_id(rev_id)
2213
if Branch.hooks['post_change_branch_tip']:
2214
# Don't calculate the last_revision_info() if there are no hooks
2216
old_revno, old_revid = self.last_revision_info()
2217
if len(rev_history) == 0:
2218
revid = _mod_revision.NULL_REVISION
2220
revid = rev_history[-1]
2221
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2222
self._write_revision_history(rev_history)
2223
self._clear_cached_state()
2224
self._cache_revision_history(rev_history)
2225
for hook in Branch.hooks['set_rh']:
2226
hook(self, rev_history)
2227
if Branch.hooks['post_change_branch_tip']:
2228
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2230
def _synchronize_history(self, destination, revision_id):
2231
"""Synchronize last revision and revision history between branches.
2233
This version is most efficient when the destination is also a
2234
BzrBranch5, but works for BzrBranch6 as long as the revision
2235
history is the true lefthand parent history, and all of the revisions
2236
are in the destination's repository. If not, set_revision_history
2239
:param destination: The branch to copy the history into
2240
:param revision_id: The revision-id to truncate history at. May
2241
be None to copy complete history.
2243
if not isinstance(destination._format, BzrBranchFormat5):
2244
super(BzrBranch, self)._synchronize_history(
2245
destination, revision_id)
2247
if revision_id == _mod_revision.NULL_REVISION:
2250
new_history = self.revision_history()
2251
if revision_id is not None and new_history != []:
2253
new_history = new_history[:new_history.index(revision_id) + 1]
2255
rev = self.repository.get_revision(revision_id)
2256
new_history = rev.get_history(self.repository)[1:]
2257
destination.set_revision_history(new_history)
2260
def set_last_revision_info(self, revno, revision_id):
2261
"""Set the last revision of this branch.
2263
The caller is responsible for checking that the revno is correct
2264
for this revision id.
2266
It may be possible to set the branch last revision to an id not
2267
present in the repository. However, branches can also be
2268
configured to check constraints on history, in which case this may not
2271
revision_id = _mod_revision.ensure_null(revision_id)
2272
# this old format stores the full history, but this api doesn't
2273
# provide it, so we must generate, and might as well check it's
2275
history = self._lefthand_history(revision_id)
2276
if len(history) != revno:
2277
raise AssertionError('%d != %d' % (len(history), revno))
2278
self.set_revision_history(history)
2280
def _gen_revision_history(self):
2281
history = self._transport.get_bytes('revision-history').split('\n')
2282
if history[-1:] == ['']:
2283
# There shouldn't be a trailing newline, but just in case.
2288
def generate_revision_history(self, revision_id, last_rev=None,
1038
self.control_files.put_utf8(
1039
'revision-history', '\n'.join(rev_history))
1040
transaction = self.get_transaction()
1041
history = transaction.map.find_revision_history()
1042
if history is not None:
1043
# update the revision history in the identity map.
1044
history[:] = list(rev_history)
1045
# this call is disabled because revision_history is
1046
# not really an object yet, and the transaction is for objects.
1047
# transaction.register_dirty(history)
1049
transaction.map.add_revision_history(rev_history)
1050
# this call is disabled because revision_history is
1051
# not really an object yet, and the transaction is for objects.
1052
# transaction.register_clean(history)
1055
def revision_history(self):
1056
"""See Branch.revision_history."""
1057
transaction = self.get_transaction()
1058
history = transaction.map.find_revision_history()
1059
if history is not None:
1060
mutter("cache hit for revision-history in %s", self)
1061
return list(history)
1062
history = [l.rstrip('\r\n') for l in
1063
self.control_files.get_utf8('revision-history').readlines()]
1064
transaction.map.add_revision_history(history)
1065
# this call is disabled because revision_history is
1066
# not really an object yet, and the transaction is for objects.
1067
# transaction.register_clean(history, precious=True)
1068
return list(history)
1071
def generate_revision_history(self, revision_id, last_rev=None,
2289
1072
other_branch=None):
2290
1073
"""Create a new revision history that will finish with revision_id.
2292
1075
:param revision_id: the new tip to use.
2293
1076
:param last_rev: The previous last_revision. If not None, then this
2294
1077
must be a ancestory of revision_id, or DivergedBranches is raised.
2295
1078
:param other_branch: The other branch that DivergedBranches should
2296
1079
raise with respect to.
2298
self.set_revision_history(self._lefthand_history(revision_id,
2299
last_rev, other_branch))
1081
# stop_revision must be a descendant of last_revision
1082
stop_graph = self.repository.get_revision_graph(revision_id)
1083
if last_rev is not None and last_rev not in stop_graph:
1084
# our previous tip is not merged into stop_revision
1085
raise errors.DivergedBranches(self, other_branch)
1086
# make a new revision history from the graph
1087
current_rev_id = revision_id
1089
while current_rev_id not in (None, revision.NULL_REVISION):
1090
new_history.append(current_rev_id)
1091
current_rev_id_parents = stop_graph[current_rev_id]
1093
current_rev_id = current_rev_id_parents[0]
1095
current_rev_id = None
1096
new_history.reverse()
1097
self.set_revision_history(new_history)
1100
def update_revisions(self, other, stop_revision=None):
1101
"""See Branch.update_revisions."""
1104
if stop_revision is None:
1105
stop_revision = other.last_revision()
1106
if stop_revision is None:
1107
# if there are no commits, we're done.
1109
# whats the current last revision, before we fetch [and change it
1111
last_rev = self.last_revision()
1112
# we fetch here regardless of whether we need to so that we pickup
1114
self.fetch(other, stop_revision)
1115
my_ancestry = self.repository.get_ancestry(last_rev)
1116
if stop_revision in my_ancestry:
1117
# last_revision is a descendant of stop_revision
1119
self.generate_revision_history(stop_revision, last_rev=last_rev,
2301
1124
def basis_tree(self):
2302
1125
"""See Branch.basis_tree."""
2303
1126
return self.repository.revision_tree(self.last_revision())
2305
def _get_parent_location(self):
1128
@deprecated_method(zero_eight)
1129
def working_tree(self):
1130
"""Create a Working tree object for this branch."""
1132
from bzrlib.transport.local import LocalTransport
1133
if (self.base.find('://') != -1 or
1134
not isinstance(self._transport, LocalTransport)):
1135
raise NoWorkingTree(self.base)
1136
return self.bzrdir.open_workingtree()
1139
def pull(self, source, overwrite=False, stop_revision=None):
1140
"""See Branch.pull."""
1143
old_count = len(self.revision_history())
1145
self.update_revisions(source,stop_revision)
1146
except DivergedBranches:
1150
self.set_revision_history(source.revision_history())
1151
new_count = len(self.revision_history())
1152
return new_count - old_count
1156
def get_parent(self):
1157
"""See Branch.get_parent."""
2306
1159
_locs = ['parent', 'pull', 'x-pull']
1160
assert self.base[-1] == '/'
2307
1161
for l in _locs:
2309
return self._transport.get_bytes(l).strip('\n')
2310
except errors.NoSuchFile:
1163
parent = self.control_files.get(l).read().strip('\n')
1166
# This is an old-format absolute path to a local branch
1167
# turn it into a url
1168
if parent.startswith('/'):
1169
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1170
return urlutils.join(self.base[:-1], parent)
2314
def _basic_push(self, target, overwrite, stop_revision):
2315
"""Basic implementation of push without bound branches or hooks.
2317
Must be called with source read locked and target write locked.
2319
result = BranchPushResult()
2320
result.source_branch = self
2321
result.target_branch = target
2322
result.old_revno, result.old_revid = target.last_revision_info()
2323
self.update_references(target)
2324
if result.old_revid != self.last_revision():
2325
# We assume that during 'push' this repository is closer than
2327
graph = self.repository.get_graph(target.repository)
2328
target.update_revisions(self, stop_revision,
2329
overwrite=overwrite, graph=graph)
2330
if self._push_should_merge_tags():
2331
result.tag_conflicts = self.tags.merge_to(target.tags,
2333
result.new_revno, result.new_revid = target.last_revision_info()
2336
def get_stacked_on_url(self):
2337
raise errors.UnstackableBranchFormat(self._format, self.base)
1173
def get_push_location(self):
1174
"""See Branch.get_push_location."""
1175
push_loc = self.get_config().get_user_option('push_location')
2339
1178
def set_push_location(self, location):
2340
1179
"""See Branch.set_push_location."""
2341
self.get_config().set_user_option(
2342
'push_location', location,
2343
store=_mod_config.STORE_LOCATION_NORECURSE)
1180
self.get_config().set_user_option('push_location', location,
2345
def _set_parent_location(self, url):
1184
def set_parent(self, url):
1185
"""See Branch.set_parent."""
1186
# TODO: Maybe delete old location files?
1187
# URLs should never be unicode, even on the local fs,
1188
# FIXUP this and get_parent in a future branch format bump:
1189
# read and rewrite the file, and have the new format code read
1190
# using .get not .get_utf8. RBC 20060125
2346
1191
if url is None:
2347
self._transport.delete('parent')
1192
self.control_files._transport.delete('parent')
2349
self._transport.put_bytes('parent', url + '\n',
2350
mode=self.bzrdir._get_file_mode())
1194
if isinstance(url, unicode):
1196
url = url.encode('ascii')
1197
except UnicodeEncodeError:
1198
raise bzrlib.errors.InvalidURL(url,
1199
"Urls must be 7-bit ascii, "
1200
"use bzrlib.urlutils.escape")
1202
url = urlutils.relative_url(self.base, url)
1203
self.control_files.put('parent', url + '\n')
1205
@deprecated_function(zero_nine)
1206
def tree_config(self):
1207
"""DEPRECATED; call get_config instead.
1208
TreeConfig has become part of BranchConfig."""
1209
return TreeConfig(self)
2353
1212
class BzrBranch5(BzrBranch):
2354
"""A format 5 branch. This supports new features over plain branches.
1213
"""A format 5 branch. This supports new features over plan branches.
2356
1215
It has support for a master_branch which is the data for bound branches.
1223
super(BzrBranch5, self).__init__(_format=_format,
1224
_control_files=_control_files,
1226
_repository=_repository)
1229
def pull(self, source, overwrite=False, stop_revision=None):
1230
"""Updates branch.pull to be bound branch aware."""
1231
bound_location = self.get_bound_location()
1232
if source.base != bound_location:
1233
# not pulling from master, so we need to update master.
1234
master_branch = self.get_master_branch()
1236
master_branch.pull(source)
1237
source = master_branch
1238
return super(BzrBranch5, self).pull(source, overwrite, stop_revision)
2359
1240
def get_bound_location(self):
2361
return self._transport.get_bytes('bound')[:-1]
1242
return self.control_files.get_utf8('bound').read()[:-1]
2362
1243
except errors.NoSuchFile:
2365
1246
@needs_read_lock
2366
def get_master_branch(self, possible_transports=None):
1247
def get_master_branch(self):
2367
1248
"""Return the branch we are bound to.
2369
1250
:return: Either a Branch, or None
2371
1252
This could memoise the branch, but if thats done
2431
1329
return self.set_bound_location(None)
2433
1331
@needs_write_lock
2434
def update(self, possible_transports=None):
2435
"""Synchronise this branch with the master branch if any.
1333
"""Synchronise this branch with the master branch if any.
2437
1335
:return: None or the last_revision that was pivoted out during the
2440
master = self.get_master_branch(possible_transports)
1338
master = self.get_master_branch()
2441
1339
if master is not None:
2442
old_tip = _mod_revision.ensure_null(self.last_revision())
1340
old_tip = self.last_revision()
2443
1341
self.pull(master, overwrite=True)
2444
if self.repository.get_graph().is_ancestor(old_tip,
2445
_mod_revision.ensure_null(self.last_revision())):
1342
if old_tip in self.repository.get_ancestry(self.last_revision()):
2451
class BzrBranch8(BzrBranch5):
2452
"""A branch that stores tree-reference locations."""
2454
def _open_hook(self):
2455
if self._ignore_fallbacks:
2458
url = self.get_stacked_on_url()
2459
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2460
errors.UnstackableBranchFormat):
2463
for hook in Branch.hooks['transform_fallback_location']:
2464
url = hook(self, url)
2466
hook_name = Branch.hooks.get_hook_name(hook)
2467
raise AssertionError(
2468
"'transform_fallback_location' hook %s returned "
2469
"None, not a URL." % hook_name)
2470
self._activate_fallback_location(url)
2472
def __init__(self, *args, **kwargs):
2473
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2474
super(BzrBranch8, self).__init__(*args, **kwargs)
2475
self._last_revision_info_cache = None
2476
self._reference_info = None
2478
def _clear_cached_state(self):
2479
super(BzrBranch8, self)._clear_cached_state()
2480
self._last_revision_info_cache = None
2481
self._reference_info = None
2483
def _last_revision_info(self):
2484
revision_string = self._transport.get_bytes('last-revision')
2485
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2486
revision_id = cache_utf8.get_cached_utf8(revision_id)
2488
return revno, revision_id
2490
def _write_last_revision_info(self, revno, revision_id):
2491
"""Simply write out the revision id, with no checks.
2493
Use set_last_revision_info to perform this safely.
2495
Does not update the revision_history cache.
2496
Intended to be called by set_last_revision_info and
2497
_write_revision_history.
2499
revision_id = _mod_revision.ensure_null(revision_id)
2500
out_string = '%d %s\n' % (revno, revision_id)
2501
self._transport.put_bytes('last-revision', out_string,
2502
mode=self.bzrdir._get_file_mode())
2505
def set_last_revision_info(self, revno, revision_id):
2506
revision_id = _mod_revision.ensure_null(revision_id)
2507
old_revno, old_revid = self.last_revision_info()
2508
if self._get_append_revisions_only():
2509
self._check_history_violation(revision_id)
2510
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2511
self._write_last_revision_info(revno, revision_id)
2512
self._clear_cached_state()
2513
self._last_revision_info_cache = revno, revision_id
2514
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2516
def _synchronize_history(self, destination, revision_id):
2517
"""Synchronize last revision and revision history between branches.
2519
:see: Branch._synchronize_history
2521
# XXX: The base Branch has a fast implementation of this method based
2522
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2523
# that uses set_revision_history. This class inherits from BzrBranch5,
2524
# but wants the fast implementation, so it calls
2525
# Branch._synchronize_history directly.
2526
Branch._synchronize_history(self, destination, revision_id)
2528
def _check_history_violation(self, revision_id):
2529
last_revision = _mod_revision.ensure_null(self.last_revision())
2530
if _mod_revision.is_null(last_revision):
2532
if last_revision not in self._lefthand_history(revision_id):
2533
raise errors.AppendRevisionsOnlyViolation(self.base)
2535
def _gen_revision_history(self):
2536
"""Generate the revision history from last revision
2538
last_revno, last_revision = self.last_revision_info()
2539
self._extend_partial_history(stop_index=last_revno-1)
2540
return list(reversed(self._partial_revision_history_cache))
2542
def _write_revision_history(self, history):
2543
"""Factored out of set_revision_history.
2545
This performs the actual writing to disk, with format-specific checks.
2546
It is intended to be called by BzrBranch5.set_revision_history.
2548
if len(history) == 0:
2549
last_revision = 'null:'
2551
if history != self._lefthand_history(history[-1]):
2552
raise errors.NotLefthandHistory(history)
2553
last_revision = history[-1]
2554
if self._get_append_revisions_only():
2555
self._check_history_violation(last_revision)
2556
self._write_last_revision_info(len(history), last_revision)
2559
def _set_parent_location(self, url):
2560
"""Set the parent branch"""
2561
self._set_config_location('parent_location', url, make_relative=True)
2564
def _get_parent_location(self):
2565
"""Set the parent branch"""
2566
return self._get_config_location('parent_location')
2569
def _set_all_reference_info(self, info_dict):
2570
"""Replace all reference info stored in a branch.
2572
:param info_dict: A dict of {file_id: (tree_path, branch_location)}
2575
writer = rio.RioWriter(s)
2576
for key, (tree_path, branch_location) in info_dict.iteritems():
2577
stanza = rio.Stanza(file_id=key, tree_path=tree_path,
2578
branch_location=branch_location)
2579
writer.write_stanza(stanza)
2580
self._transport.put_bytes('references', s.getvalue())
2581
self._reference_info = info_dict
2584
def _get_all_reference_info(self):
2585
"""Return all the reference info stored in a branch.
2587
:return: A dict of {file_id: (tree_path, branch_location)}
2589
if self._reference_info is not None:
2590
return self._reference_info
2591
rio_file = self._transport.get('references')
2593
stanzas = rio.read_stanzas(rio_file)
2594
info_dict = dict((s['file_id'], (s['tree_path'],
2595
s['branch_location'])) for s in stanzas)
2598
self._reference_info = info_dict
2601
def set_reference_info(self, file_id, tree_path, branch_location):
2602
"""Set the branch location to use for a tree reference.
2604
:param file_id: The file-id of the tree reference.
2605
:param tree_path: The path of the tree reference in the tree.
2606
:param branch_location: The location of the branch to retrieve tree
2609
info_dict = self._get_all_reference_info()
2610
info_dict[file_id] = (tree_path, branch_location)
2611
if None in (tree_path, branch_location):
2612
if tree_path is not None:
2613
raise ValueError('tree_path must be None when branch_location'
2615
if branch_location is not None:
2616
raise ValueError('branch_location must be None when tree_path'
2618
del info_dict[file_id]
2619
self._set_all_reference_info(info_dict)
2621
def get_reference_info(self, file_id):
2622
"""Get the tree_path and branch_location for a tree reference.
2624
:return: a tuple of (tree_path, branch_location)
2626
return self._get_all_reference_info().get(file_id, (None, None))
2628
def reference_parent(self, file_id, path, possible_transports=None):
2629
"""Return the parent branch for a tree-reference file_id.
2631
:param file_id: The file_id of the tree reference
2632
:param path: The path of the file_id in the tree
2633
:return: A branch associated with the file_id
2635
branch_location = self.get_reference_info(file_id)[1]
2636
if branch_location is None:
2637
return Branch.reference_parent(self, file_id, path,
2638
possible_transports)
2639
branch_location = urlutils.join(self.base, branch_location)
2640
return Branch.open(branch_location,
2641
possible_transports=possible_transports)
2643
def set_push_location(self, location):
2644
"""See Branch.set_push_location."""
2645
self._set_config_location('push_location', location)
2647
def set_bound_location(self, location):
2648
"""See Branch.set_push_location."""
2650
config = self.get_config()
2651
if location is None:
2652
if config.get_user_option('bound') != 'True':
2655
config.set_user_option('bound', 'False', warn_masked=True)
2658
self._set_config_location('bound_location', location,
2660
config.set_user_option('bound', 'True', warn_masked=True)
2663
def _get_bound_location(self, bound):
2664
"""Return the bound location in the config file.
2666
Return None if the bound parameter does not match"""
2667
config = self.get_config()
2668
config_bound = (config.get_user_option('bound') == 'True')
2669
if config_bound != bound:
2671
return self._get_config_location('bound_location', config=config)
2673
def get_bound_location(self):
2674
"""See Branch.set_push_location."""
2675
return self._get_bound_location(True)
2677
def get_old_bound_location(self):
2678
"""See Branch.get_old_bound_location"""
2679
return self._get_bound_location(False)
2681
def get_stacked_on_url(self):
2682
# you can always ask for the URL; but you might not be able to use it
2683
# if the repo can't support stacking.
2684
## self._check_stackable_repo()
2685
stacked_url = self._get_config_location('stacked_on_location')
2686
if stacked_url is None:
2687
raise errors.NotStacked(self)
2690
def _get_append_revisions_only(self):
2691
value = self.get_config().get_user_option('append_revisions_only')
2692
return value == 'True'
2695
def generate_revision_history(self, revision_id, last_rev=None,
2697
"""See BzrBranch5.generate_revision_history"""
2698
history = self._lefthand_history(revision_id, last_rev, other_branch)
2699
revno = len(history)
2700
self.set_last_revision_info(revno, revision_id)
2703
def get_rev_id(self, revno, history=None):
2704
"""Find the revision id of the specified revno."""
2706
return _mod_revision.NULL_REVISION
2708
last_revno, last_revision_id = self.last_revision_info()
2709
if revno <= 0 or revno > last_revno:
2710
raise errors.NoSuchRevision(self, revno)
2712
if history is not None:
2713
return history[revno - 1]
2715
index = last_revno - revno
2716
if len(self._partial_revision_history_cache) <= index:
2717
self._extend_partial_history(stop_index=index)
2718
if len(self._partial_revision_history_cache) > index:
2719
return self._partial_revision_history_cache[index]
2721
raise errors.NoSuchRevision(self, revno)
2724
def revision_id_to_revno(self, revision_id):
2725
"""Given a revision id, return its revno"""
2726
if _mod_revision.is_null(revision_id):
2729
index = self._partial_revision_history_cache.index(revision_id)
2731
self._extend_partial_history(stop_revision=revision_id)
2732
index = len(self._partial_revision_history_cache) - 1
2733
if self._partial_revision_history_cache[index] != revision_id:
2734
raise errors.NoSuchRevision(self, revision_id)
2735
return self.revno() - index
2738
class BzrBranch7(BzrBranch8):
2739
"""A branch with support for a fallback repository."""
2741
def set_reference_info(self, file_id, tree_path, branch_location):
2742
Branch.set_reference_info(self, file_id, tree_path, branch_location)
2744
def get_reference_info(self, file_id):
2745
Branch.get_reference_info(self, file_id)
2747
def reference_parent(self, file_id, path, possible_transports=None):
2748
return Branch.reference_parent(self, file_id, path,
2749
possible_transports)
2752
class BzrBranch6(BzrBranch7):
2753
"""See BzrBranchFormat6 for the capabilities of this branch.
2755
This subclass of BzrBranch7 disables the new features BzrBranch7 added,
2759
def get_stacked_on_url(self):
2760
raise errors.UnstackableBranchFormat(self._format, self.base)
2763
######################################################################
2764
# results of operations
2767
class _Result(object):
2769
def _show_tag_conficts(self, to_file):
2770
if not getattr(self, 'tag_conflicts', None):
2772
to_file.write('Conflicting tags:\n')
2773
for name, value1, value2 in self.tag_conflicts:
2774
to_file.write(' %s\n' % (name, ))
2777
class PullResult(_Result):
2778
"""Result of a Branch.pull operation.
2780
:ivar old_revno: Revision number before pull.
2781
:ivar new_revno: Revision number after pull.
2782
:ivar old_revid: Tip revision id before pull.
2783
:ivar new_revid: Tip revision id after pull.
2784
:ivar source_branch: Source (local) branch object. (read locked)
2785
:ivar master_branch: Master branch of the target, or the target if no
2787
:ivar local_branch: target branch if there is a Master, else None
2788
:ivar target_branch: Target/destination branch object. (write locked)
2789
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
2793
# DEPRECATED: pull used to return the change in revno
2794
return self.new_revno - self.old_revno
2796
def report(self, to_file):
2798
if self.old_revid == self.new_revid:
2799
to_file.write('No revisions to pull.\n')
2801
to_file.write('Now on revision %d.\n' % self.new_revno)
2802
self._show_tag_conficts(to_file)
2805
class BranchPushResult(_Result):
2806
"""Result of a Branch.push operation.
2808
:ivar old_revno: Revision number (eg 10) of the target before push.
2809
:ivar new_revno: Revision number (eg 12) of the target after push.
2810
:ivar old_revid: Tip revision id (eg joe@foo.com-1234234-aoeua34) of target
2812
:ivar new_revid: Tip revision id (eg joe@foo.com-5676566-boa234a) of target
2814
:ivar source_branch: Source branch object that the push was from. This is
2815
read locked, and generally is a local (and thus low latency) branch.
2816
:ivar master_branch: If target is a bound branch, the master branch of
2817
target, or target itself. Always write locked.
2818
:ivar target_branch: The direct Branch where data is being sent (write
2820
:ivar local_branch: If the target is a bound branch this will be the
2821
target, otherwise it will be None.
2825
# DEPRECATED: push used to return the change in revno
2826
return self.new_revno - self.old_revno
2828
def report(self, to_file):
2829
"""Write a human-readable description of the result."""
2830
if self.old_revid == self.new_revid:
2831
note('No new revisions to push.')
2833
note('Pushed up to revision %d.' % self.new_revno)
2834
self._show_tag_conficts(to_file)
1348
class BranchTestProviderAdapter(object):
1349
"""A tool to generate a suite testing multiple branch formats at once.
1351
This is done by copying the test once for each transport and injecting
1352
the transport_server, transport_readonly_server, and branch_format
1353
classes into each copy. Each copy is also given a new id() to make it
1357
def __init__(self, transport_server, transport_readonly_server, formats):
1358
self._transport_server = transport_server
1359
self._transport_readonly_server = transport_readonly_server
1360
self._formats = formats
1362
def adapt(self, test):
1363
result = TestSuite()
1364
for branch_format, bzrdir_format in self._formats:
1365
new_test = deepcopy(test)
1366
new_test.transport_server = self._transport_server
1367
new_test.transport_readonly_server = self._transport_readonly_server
1368
new_test.bzrdir_format = bzrdir_format
1369
new_test.branch_format = branch_format
1370
def make_new_test_id():
1371
new_id = "%s(%s)" % (new_test.id(), branch_format.__class__.__name__)
1372
return lambda: new_id
1373
new_test.id = make_new_test_id()
1374
result.addTest(new_test)
2837
1378
class BranchCheckResult(object):
2843
1384
def __init__(self, branch):
2844
1385
self.branch = branch
2847
1387
def report_results(self, verbose):
2848
1388
"""Report the check results via trace.note.
2850
1390
:param verbose: Requests more detailed display of what was checked,
2853
note('checked branch %s format %s', self.branch.base,
2854
self.branch._format)
2855
for error in self.errors:
2856
note('found error:%s', error)
2859
class Converter5to6(object):
2860
"""Perform an in-place upgrade of format 5 to format 6"""
2862
def convert(self, branch):
2863
# Data for 5 and 6 can peacefully coexist.
2864
format = BzrBranchFormat6()
2865
new_branch = format.open(branch.bzrdir, _found=True)
2867
# Copy source data into target
2868
new_branch._write_last_revision_info(*branch.last_revision_info())
2869
new_branch.set_parent(branch.get_parent())
2870
new_branch.set_bound_location(branch.get_bound_location())
2871
new_branch.set_push_location(branch.get_push_location())
2873
# New branch has no tags by default
2874
new_branch.tags._set_tag_dict({})
2876
# Copying done; now update target format
2877
new_branch._transport.put_bytes('format',
2878
format.get_format_string(),
2879
mode=new_branch.bzrdir._get_file_mode())
2881
# Clean up old files
2882
new_branch._transport.delete('revision-history')
2884
branch.set_parent(None)
2885
except errors.NoSuchFile:
2887
branch.set_bound_location(None)
2890
class Converter6to7(object):
2891
"""Perform an in-place upgrade of format 6 to format 7"""
2893
def convert(self, branch):
2894
format = BzrBranchFormat7()
2895
branch._set_config_location('stacked_on_location', '')
2896
# update target format
2897
branch._transport.put_bytes('format', format.get_format_string())
2900
class Converter7to8(object):
2901
"""Perform an in-place upgrade of format 6 to format 7"""
2903
def convert(self, branch):
2904
format = BzrBranchFormat8()
2905
branch._transport.put_bytes('references', '')
2906
# update target format
2907
branch._transport.put_bytes('format', format.get_format_string())
2910
def _run_with_write_locked_target(target, callable, *args, **kwargs):
2911
"""Run ``callable(*args, **kwargs)``, write-locking target for the
2914
_run_with_write_locked_target will attempt to release the lock it acquires.
2916
If an exception is raised by callable, then that exception *will* be
2917
propagated, even if the unlock attempt raises its own error. Thus
2918
_run_with_write_locked_target should be preferred to simply doing::
2922
return callable(*args, **kwargs)
2927
# This is very similar to bzrlib.decorators.needs_write_lock. Perhaps they
2928
# should share code?
2931
result = callable(*args, **kwargs)
2933
exc_info = sys.exc_info()
2937
raise exc_info[0], exc_info[1], exc_info[2]
2943
class InterBranch(InterObject):
2944
"""This class represents operations taking place between two branches.
2946
Its instances have methods like pull() and push() and contain
2947
references to the source and target repositories these operations
2948
can be carried out on.
2952
"""The available optimised InterBranch types."""
2955
def _get_branch_formats_to_test():
2956
"""Return a tuple with the Branch formats to use when testing."""
2957
raise NotImplementedError(InterBranch._get_branch_formats_to_test)
2959
def pull(self, overwrite=False, stop_revision=None,
2960
possible_transports=None, local=False):
2961
"""Mirror source into target branch.
2963
The target branch is considered to be 'local', having low latency.
2965
:returns: PullResult instance
2967
raise NotImplementedError(self.pull)
2969
def update_revisions(self, stop_revision=None, overwrite=False,
2971
"""Pull in new perfect-fit revisions.
2973
:param stop_revision: Updated until the given revision
2974
:param overwrite: Always set the branch pointer, rather than checking
2975
to see if it is a proper descendant.
2976
:param graph: A Graph object that can be used to query history
2977
information. This can be None.
2980
raise NotImplementedError(self.update_revisions)
2982
def push(self, overwrite=False, stop_revision=None,
2983
_override_hook_source_branch=None):
2984
"""Mirror the source branch into the target branch.
2986
The source branch is considered to be 'local', having low latency.
2988
raise NotImplementedError(self.push)
2991
class GenericInterBranch(InterBranch):
2992
"""InterBranch implementation that uses public Branch functions.
2996
def _get_branch_formats_to_test():
2997
return BranchFormat._default_format, BranchFormat._default_format
2999
def update_revisions(self, stop_revision=None, overwrite=False,
3001
"""See InterBranch.update_revisions()."""
3002
self.source.lock_read()
3004
other_revno, other_last_revision = self.source.last_revision_info()
3005
stop_revno = None # unknown
3006
if stop_revision is None:
3007
stop_revision = other_last_revision
3008
if _mod_revision.is_null(stop_revision):
3009
# if there are no commits, we're done.
3011
stop_revno = other_revno
3013
# what's the current last revision, before we fetch [and change it
3015
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3016
# we fetch here so that we don't process data twice in the common
3017
# case of having something to pull, and so that the check for
3018
# already merged can operate on the just fetched graph, which will
3019
# be cached in memory.
3020
self.target.fetch(self.source, stop_revision)
3021
# Check to see if one is an ancestor of the other
3024
graph = self.target.repository.get_graph()
3025
if self.target._check_if_descendant_or_diverged(
3026
stop_revision, last_rev, graph, self.source):
3027
# stop_revision is a descendant of last_rev, but we aren't
3028
# overwriting, so we're done.
3030
if stop_revno is None:
3032
graph = self.target.repository.get_graph()
3033
this_revno, this_last_revision = \
3034
self.target.last_revision_info()
3035
stop_revno = graph.find_distance_to_null(stop_revision,
3036
[(other_last_revision, other_revno),
3037
(this_last_revision, this_revno)])
3038
self.target.set_last_revision_info(stop_revno, stop_revision)
3040
self.source.unlock()
3042
def pull(self, overwrite=False, stop_revision=None,
3043
possible_transports=None, _hook_master=None, run_hooks=True,
3044
_override_hook_target=None, local=False):
3047
:param _hook_master: Private parameter - set the branch to
3048
be supplied as the master to pull hooks.
3049
:param run_hooks: Private parameter - if false, this branch
3050
is being called because it's the master of the primary branch,
3051
so it should not run its hooks.
3052
:param _override_hook_target: Private parameter - set the branch to be
3053
supplied as the target_branch to pull hooks.
3054
:param local: Only update the local branch, and not the bound branch.
3056
# This type of branch can't be bound.
3058
raise errors.LocalRequiresBoundBranch()
3059
result = PullResult()
3060
result.source_branch = self.source
3061
if _override_hook_target is None:
3062
result.target_branch = self.target
3064
result.target_branch = _override_hook_target
3065
self.source.lock_read()
3067
# We assume that during 'pull' the target repository is closer than
3069
self.source.update_references(self.target)
3070
graph = self.target.repository.get_graph(self.source.repository)
3071
# TODO: Branch formats should have a flag that indicates
3072
# that revno's are expensive, and pull() should honor that flag.
3074
result.old_revno, result.old_revid = \
3075
self.target.last_revision_info()
3076
self.target.update_revisions(self.source, stop_revision,
3077
overwrite=overwrite, graph=graph)
3078
# TODO: The old revid should be specified when merging tags,
3079
# so a tags implementation that versions tags can only
3080
# pull in the most recent changes. -- JRV20090506
3081
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3083
result.new_revno, result.new_revid = self.target.last_revision_info()
3085
result.master_branch = _hook_master
3086
result.local_branch = result.target_branch
3088
result.master_branch = result.target_branch
3089
result.local_branch = None
3091
for hook in Branch.hooks['post_pull']:
3094
self.source.unlock()
3097
def push(self, overwrite=False, stop_revision=None,
3098
_override_hook_source_branch=None):
3099
"""See InterBranch.push.
3101
This is the basic concrete implementation of push()
3103
:param _override_hook_source_branch: If specified, run
3104
the hooks passing this Branch as the source, rather than self.
3105
This is for use of RemoteBranch, where push is delegated to the
3106
underlying vfs-based Branch.
3108
# TODO: Public option to disable running hooks - should be trivial but
3110
self.source.lock_read()
3112
return _run_with_write_locked_target(
3113
self.target, self._push_with_bound_branches, overwrite,
3115
_override_hook_source_branch=_override_hook_source_branch)
3117
self.source.unlock()
3119
def _push_with_bound_branches(self, overwrite, stop_revision,
3120
_override_hook_source_branch=None):
3121
"""Push from source into target, and into target's master if any.
3124
if _override_hook_source_branch:
3125
result.source_branch = _override_hook_source_branch
3126
for hook in Branch.hooks['post_push']:
3129
bound_location = self.target.get_bound_location()
3130
if bound_location and self.target.base != bound_location:
3131
# there is a master branch.
3133
# XXX: Why the second check? Is it even supported for a branch to
3134
# be bound to itself? -- mbp 20070507
3135
master_branch = self.target.get_master_branch()
3136
master_branch.lock_write()
3138
# push into the master from the source branch.
3139
self.source._basic_push(master_branch, overwrite, stop_revision)
3140
# and push into the target branch from the source. Note that we
3141
# push from the source branch again, because its considered the
3142
# highest bandwidth repository.
3143
result = self.source._basic_push(self.target, overwrite,
3145
result.master_branch = master_branch
3146
result.local_branch = self.target
3150
master_branch.unlock()
3153
result = self.source._basic_push(self.target, overwrite,
3155
# TODO: Why set master_branch and local_branch if there's no
3156
# binding? Maybe cleaner to just leave them unset? -- mbp
3158
result.master_branch = self.target
3159
result.local_branch = None
3164
def is_compatible(self, source, target):
3165
# GenericBranch uses the public API, so always compatible
3169
class InterToBranch5(GenericInterBranch):
3172
def _get_branch_formats_to_test():
3173
return BranchFormat._default_format, BzrBranchFormat5()
3175
def pull(self, overwrite=False, stop_revision=None,
3176
possible_transports=None, run_hooks=True,
3177
_override_hook_target=None, local=False):
3178
"""Pull from source into self, updating my master if any.
3180
:param run_hooks: Private parameter - if false, this branch
3181
is being called because it's the master of the primary branch,
3182
so it should not run its hooks.
3184
bound_location = self.target.get_bound_location()
3185
if local and not bound_location:
3186
raise errors.LocalRequiresBoundBranch()
3187
master_branch = None
3188
if not local and bound_location and self.source.base != bound_location:
3189
# not pulling from master, so we need to update master.
3190
master_branch = self.target.get_master_branch(possible_transports)
3191
master_branch.lock_write()
3194
# pull from source into master.
3195
master_branch.pull(self.source, overwrite, stop_revision,
3197
return super(InterToBranch5, self).pull(overwrite,
3198
stop_revision, _hook_master=master_branch,
3199
run_hooks=run_hooks,
3200
_override_hook_target=_override_hook_target)
3203
master_branch.unlock()
3206
InterBranch.register_optimiser(GenericInterBranch)
3207
InterBranch.register_optimiser(InterToBranch5)
1393
note('checked branch %s format %s',
1395
self.branch._format)
1398
######################################################################
1402
@deprecated_function(zero_eight)
1403
def is_control_file(*args, **kwargs):
1404
"""See bzrlib.workingtree.is_control_file."""
1405
return bzrlib.workingtree.is_control_file(*args, **kwargs)
added
removed
bzrlib/branch.py
