156
132
possible_transports)
157
133
return control.open_branch(), relpath
159
def _push_should_merge_tags(self):
160
"""Should _basic_push merge this branch's tags into the target?
162
The default implementation returns False if this branch has no tags,
163
and True the rest of the time. Subclasses may override this.
165
return self.supports_tags() and self.tags.get_tag_dict()
167
135
def get_config(self):
168
136
return BranchConfig(self)
170
def _get_config(self):
171
"""Get the concrete config for just the config in this branch.
173
This is not intended for client use; see Branch.get_config for the
178
:return: An object supporting get_option and set_option.
180
raise NotImplementedError(self._get_config)
182
def _get_fallback_repository(self, url):
183
"""Get the repository we fallback to at url."""
184
url = urlutils.join(self.base, url)
185
a_bzrdir = bzrdir.BzrDir.open(url,
186
possible_transports=[self.bzrdir.root_transport])
187
return a_bzrdir.open_branch().repository
189
def _get_tags_bytes(self):
190
"""Get the bytes of a serialised tags dict.
192
Note that not all branches support tags, nor do all use the same tags
193
logic: this method is specific to BasicTags. Other tag implementations
194
may use the same method name and behave differently, safely, because
195
of the double-dispatch via
196
format.make_tags->tags_instance->get_tags_dict.
198
:return: The bytes of the tags file.
199
:seealso: Branch._set_tags_bytes.
201
return self._transport.get_bytes('tags')
203
def _get_nick(self, local=False, possible_transports=None):
204
config = self.get_config()
205
# explicit overrides master, but don't look for master if local is True
206
if not local and not config.has_explicit_nickname():
208
master = self.get_master_branch(possible_transports)
209
if master is not None:
210
# return the master branch value
212
except errors.BzrError, e:
213
# Silently fall back to local implicit nick if the master is
215
mutter("Could not connect to bound branch, "
216
"falling back to local nick.\n " + str(e))
217
return config.get_nickname()
139
return self.get_config().get_nickname()
219
141
def _set_nick(self, nick):
220
142
self.get_config().set_user_option('nickname', nick, warn_masked=True)
268
163
raise NotImplementedError(self.get_physical_lock_status)
271
def dotted_revno_to_revision_id(self, revno, _cache_reverse=False):
272
"""Return the revision_id for a dotted revno.
274
:param revno: a tuple like (1,) or (1,1,2)
275
:param _cache_reverse: a private parameter enabling storage
276
of the reverse mapping in a top level cache. (This should
277
only be done in selective circumstances as we want to
278
avoid having the mapping cached multiple times.)
279
:return: the revision_id
280
:raises errors.NoSuchRevision: if the revno doesn't exist
282
rev_id = self._do_dotted_revno_to_revision_id(revno)
284
self._partial_revision_id_to_revno_cache[rev_id] = revno
287
def _do_dotted_revno_to_revision_id(self, revno):
288
"""Worker function for dotted_revno_to_revision_id.
290
Subclasses should override this if they wish to
291
provide a more efficient implementation.
294
return self.get_rev_id(revno[0])
295
revision_id_to_revno = self.get_revision_id_to_revno_map()
296
revision_ids = [revision_id for revision_id, this_revno
297
in revision_id_to_revno.iteritems()
298
if revno == this_revno]
299
if len(revision_ids) == 1:
300
return revision_ids[0]
302
revno_str = '.'.join(map(str, revno))
303
raise errors.NoSuchRevision(self, revno_str)
306
def revision_id_to_dotted_revno(self, revision_id):
307
"""Given a revision id, return its dotted revno.
309
:return: a tuple like (1,) or (400,1,3).
311
return self._do_revision_id_to_dotted_revno(revision_id)
313
def _do_revision_id_to_dotted_revno(self, revision_id):
314
"""Worker function for revision_id_to_revno."""
315
# Try the caches if they are loaded
316
result = self._partial_revision_id_to_revno_cache.get(revision_id)
317
if result is not None:
319
if self._revision_id_to_revno_cache:
320
result = self._revision_id_to_revno_cache.get(revision_id)
322
raise errors.NoSuchRevision(self, revision_id)
323
# Try the mainline as it's optimised
325
revno = self.revision_id_to_revno(revision_id)
327
except errors.NoSuchRevision:
328
# We need to load and use the full revno map after all
329
result = self.get_revision_id_to_revno_map().get(revision_id)
331
raise errors.NoSuchRevision(self, revision_id)
335
166
def get_revision_id_to_revno_map(self):
336
167
"""Return the revision_id => dotted revno map.
362
193
:return: A dictionary mapping revision_id => dotted revno.
195
last_revision = self.last_revision()
196
revision_graph = repository._old_get_graph(self.repository,
198
merge_sorted_revisions = tsort.merge_sort(
364
203
revision_id_to_revno = dict((rev_id, revno)
365
for rev_id, depth, revno, end_of_merge
366
in self.iter_merge_sorted_revisions())
204
for seq_num, rev_id, depth, revno, end_of_merge
205
in merge_sorted_revisions)
367
206
return revision_id_to_revno
370
def iter_merge_sorted_revisions(self, start_revision_id=None,
371
stop_revision_id=None, stop_rule='exclude', direction='reverse'):
372
"""Walk the revisions for a branch in merge sorted order.
374
Merge sorted order is the output from a merge-aware,
375
topological sort, i.e. all parents come before their
376
children going forward; the opposite for reverse.
378
:param start_revision_id: the revision_id to begin walking from.
379
If None, the branch tip is used.
380
:param stop_revision_id: the revision_id to terminate the walk
381
after. If None, the rest of history is included.
382
:param stop_rule: if stop_revision_id is not None, the precise rule
383
to use for termination:
384
* 'exclude' - leave the stop revision out of the result (default)
385
* 'include' - the stop revision is the last item in the result
386
* 'with-merges' - include the stop revision and all of its
387
merged revisions in the result
388
:param direction: either 'reverse' or 'forward':
389
* reverse means return the start_revision_id first, i.e.
390
start at the most recent revision and go backwards in history
391
* forward returns tuples in the opposite order to reverse.
392
Note in particular that forward does *not* do any intelligent
393
ordering w.r.t. depth as some clients of this API may like.
394
(If required, that ought to be done at higher layers.)
396
:return: an iterator over (revision_id, depth, revno, end_of_merge)
399
* revision_id: the unique id of the revision
400
* depth: How many levels of merging deep this node has been
402
* revno_sequence: This field provides a sequence of
403
revision numbers for all revisions. The format is:
404
(REVNO, BRANCHNUM, BRANCHREVNO). BRANCHNUM is the number of the
405
branch that the revno is on. From left to right the REVNO numbers
406
are the sequence numbers within that branch of the revision.
407
* end_of_merge: When True the next node (earlier in history) is
408
part of a different merge.
410
# Note: depth and revno values are in the context of the branch so
411
# we need the full graph to get stable numbers, regardless of the
413
if self._merge_sorted_revisions_cache is None:
414
last_revision = self.last_revision()
415
graph = self.repository.get_graph()
416
parent_map = dict(((key, value) for key, value in
417
graph.iter_ancestry([last_revision]) if value is not None))
418
revision_graph = repository._strip_NULL_ghosts(parent_map)
419
revs = tsort.merge_sort(revision_graph, last_revision, None,
421
# Drop the sequence # before caching
422
self._merge_sorted_revisions_cache = [r[1:] for r in revs]
424
filtered = self._filter_merge_sorted_revisions(
425
self._merge_sorted_revisions_cache, start_revision_id,
426
stop_revision_id, stop_rule)
427
if direction == 'reverse':
429
if direction == 'forward':
430
return reversed(list(filtered))
432
raise ValueError('invalid direction %r' % direction)
434
def _filter_merge_sorted_revisions(self, merge_sorted_revisions,
435
start_revision_id, stop_revision_id, stop_rule):
436
"""Iterate over an inclusive range of sorted revisions."""
437
rev_iter = iter(merge_sorted_revisions)
438
if start_revision_id is not None:
439
for rev_id, depth, revno, end_of_merge in rev_iter:
440
if rev_id != start_revision_id:
443
# The decision to include the start or not
444
# depends on the stop_rule if a stop is provided
446
iter([(rev_id, depth, revno, end_of_merge)]),
449
if stop_revision_id is None:
450
for rev_id, depth, revno, end_of_merge in rev_iter:
451
yield rev_id, depth, revno, end_of_merge
452
elif stop_rule == 'exclude':
453
for rev_id, depth, revno, end_of_merge in rev_iter:
454
if rev_id == stop_revision_id:
456
yield rev_id, depth, revno, end_of_merge
457
elif stop_rule == 'include':
458
for rev_id, depth, revno, end_of_merge in rev_iter:
459
yield rev_id, depth, revno, end_of_merge
460
if rev_id == stop_revision_id:
462
elif stop_rule == 'with-merges':
463
stop_rev = self.repository.get_revision(stop_revision_id)
464
if stop_rev.parent_ids:
465
left_parent = stop_rev.parent_ids[0]
467
left_parent = _mod_revision.NULL_REVISION
468
for rev_id, depth, revno, end_of_merge in rev_iter:
469
if rev_id == left_parent:
471
yield rev_id, depth, revno, end_of_merge
473
raise ValueError('invalid stop_rule %r' % stop_rule)
475
208
def leave_lock_in_place(self):
476
209
"""Tell this branch object not to release the physical lock when this
477
210
object is unlocked.
479
212
If lock_write doesn't return a token, then this method is not supported.
481
214
self.control_files.leave_in_place()
590
339
def set_revision_history(self, rev_history):
591
340
raise NotImplementedError(self.set_revision_history)
593
def set_stacked_on_url(self, url):
594
"""Set the URL this branch is stacked against.
596
:raises UnstackableBranchFormat: If the branch does not support
598
:raises UnstackableRepositoryFormat: If the repository does not support
601
if not self._format.supports_stacking():
602
raise errors.UnstackableBranchFormat(self._format, self.base)
603
self._check_stackable_repo()
606
old_url = self.get_stacked_on_url()
607
except (errors.NotStacked, errors.UnstackableBranchFormat,
608
errors.UnstackableRepositoryFormat):
611
# repositories don't offer an interface to remove fallback
612
# repositories today; take the conceptually simpler option and just
614
self.repository = self.bzrdir.find_repository()
615
# for every revision reference the branch has, ensure it is pulled
617
source_repository = self._get_fallback_repository(old_url)
618
for revision_id in chain([self.last_revision()],
619
self.tags.get_reverse_tag_dict()):
620
self.repository.fetch(source_repository, revision_id,
623
self._activate_fallback_location(url)
624
# write this out after the repository is stacked to avoid setting a
625
# stacked config that doesn't work.
626
self._set_config_location('stacked_on_location', url)
629
def _set_tags_bytes(self, bytes):
630
"""Mirror method for _get_tags_bytes.
632
:seealso: Branch._get_tags_bytes.
634
return _run_with_write_locked_target(self, self._transport.put_bytes,
637
342
def _cache_revision_history(self, rev_history):
638
343
"""Set the cached revision history to rev_history.
755
451
if stop_revision is None:
756
452
stop_revision = other_len
454
assert isinstance(stop_revision, int)
758
455
if stop_revision > other_len:
759
456
raise errors.NoSuchRevision(self, stop_revision)
760
457
return other_history[self_len:stop_revision]
763
def update_revisions(self, other, stop_revision=None, overwrite=False,
459
def update_revisions(self, other, stop_revision=None):
765
460
"""Pull in new perfect-fit revisions.
767
462
:param other: Another Branch to pull from
768
463
:param stop_revision: Updated until the given revision
769
:param overwrite: Always set the branch pointer, rather than checking
770
to see if it is a proper descendant.
771
:param graph: A Graph object that can be used to query history
772
information. This can be None.
775
return InterBranch.get(other, self).update_revisions(stop_revision,
778
def import_last_revision_info(self, source_repo, revno, revid):
779
"""Set the last revision info, importing from another repo if necessary.
781
This is used by the bound branch code to upload a revision to
782
the master branch first before updating the tip of the local branch.
784
:param source_repo: Source repository to optionally fetch from
785
:param revno: Revision number of the new tip
786
:param revid: Revision id of the new tip
788
if not self.repository.has_same_location(source_repo):
789
self.repository.fetch(source_repo, revision_id=revid)
790
self.set_last_revision_info(revno, revid)
466
raise NotImplementedError(self.update_revisions)
792
468
def revision_id_to_revno(self, revision_id):
793
469
"""Given a revision id, return its revno"""
830
506
"""Return `Tree` object for last revision."""
831
507
return self.repository.revision_tree(self.last_revision())
509
def rename_one(self, from_rel, to_rel):
512
This can change the directory or the filename or both.
514
raise NotImplementedError(self.rename_one)
516
def move(self, from_paths, to_name):
519
to_name must exist as a versioned directory.
521
If to_name exists and is a directory, the files are moved into
522
it, keeping their old names. If it is a directory,
524
Note that to_name is only the last component of the new name;
525
this doesn't change the directory.
527
This returns a list of (from_path, to_path) pairs for each
530
raise NotImplementedError(self.move)
833
532
def get_parent(self):
834
533
"""Return the parent location of the branch.
836
This is the default location for pull/missing. The usual
535
This is the default location for push/pull/missing. The usual
837
536
pattern is that the user can override it by specifying a
840
parent = self._get_parent_location()
843
# This is an old-format absolute path to a local branch
845
if parent.startswith('/'):
846
parent = urlutils.local_path_to_url(parent.decode('utf8'))
848
return urlutils.join(self.base[:-1], parent)
849
except errors.InvalidURLJoin, e:
850
raise errors.InaccessibleParent(parent, self.base)
852
def _get_parent_location(self):
853
raise NotImplementedError(self._get_parent_location)
539
raise NotImplementedError(self.get_parent)
855
541
def _set_config_location(self, name, url, config=None,
856
542
make_relative=False):
972
628
raise errors.InvalidRevisionNumber(revno)
975
def clone(self, to_bzrdir, revision_id=None, repository_policy=None):
631
def clone(self, to_bzrdir, revision_id=None):
976
632
"""Clone this branch into to_bzrdir preserving all semantic values.
978
Most API users will want 'create_clone_on_transport', which creates a
979
new bzrdir and branch on the fly.
981
634
revision_id: if not None, the revision history in the new branch will
982
635
be truncated to end with revision_id.
984
result = to_bzrdir.create_branch()
985
if repository_policy is not None:
986
repository_policy.configure_branch(result)
637
result = self._format.initialize(to_bzrdir)
987
638
self.copy_content_into(result, revision_id=revision_id)
991
def sprout(self, to_bzrdir, revision_id=None, repository_policy=None):
642
def sprout(self, to_bzrdir, revision_id=None):
992
643
"""Create a new line of development from the branch, into to_bzrdir.
994
to_bzrdir controls the branch format.
996
645
revision_id: if not None, the revision history in the new branch will
997
646
be truncated to end with revision_id.
999
result = to_bzrdir.create_branch()
1000
if repository_policy is not None:
1001
repository_policy.configure_branch(result)
648
result = self._format.initialize(to_bzrdir)
1002
649
self.copy_content_into(result, revision_id=revision_id)
1003
650
result.set_parent(self.bzrdir.root_transport.base)
1007
654
"""Synchronize last revision and revision history between branches.
1009
656
This version is most efficient when the destination is also a
1010
BzrBranch6, but works for BzrBranch5, as long as the destination's
1011
repository contains all the lefthand ancestors of the intended
1012
last_revision. If not, set_last_revision_info will fail.
657
BzrBranch5, but works for BzrBranch6 as long as the revision
658
history is the true lefthand parent history, and all of the revisions
659
are in the destination's repository. If not, set_revision_history
1014
662
:param destination: The branch to copy the history into
1015
663
:param revision_id: The revision-id to truncate history at. May
1016
664
be None to copy complete history.
1018
source_revno, source_revision_id = self.last_revision_info()
1019
if revision_id is None:
1020
revno, revision_id = source_revno, source_revision_id
1021
elif source_revision_id == revision_id:
1022
# we know the revno without needing to walk all of history
1023
revno = source_revno
1025
# To figure out the revno for a random revision, we need to build
1026
# the revision history, and count its length.
1027
# We don't care about the order, just how long it is.
1028
# Alternatively, we could start at the current location, and count
1029
# backwards. But there is no guarantee that we will find it since
1030
# it may be a merged revision.
1031
revno = len(list(self.repository.iter_reverse_revision_history(
1033
destination.set_last_revision_info(revno, revision_id)
666
if revision_id == _mod_revision.NULL_REVISION:
668
new_history = self.revision_history()
669
if revision_id is not None and new_history != []:
671
new_history = new_history[:new_history.index(revision_id) + 1]
673
rev = self.repository.get_revision(revision_id)
674
new_history = rev.get_history(self.repository)[1:]
675
destination.set_revision_history(new_history)
1035
677
@needs_read_lock
1036
678
def copy_content_into(self, destination, revision_id=None):
1186
795
def supports_tags(self):
1187
796
return self._format.supports_tags()
1189
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1191
"""Ensure that revision_b is a descendant of revision_a.
1193
This is a helper function for update_revisions.
1195
:raises: DivergedBranches if revision_b has diverged from revision_a.
1196
:returns: True if revision_b is a descendant of revision_a.
1198
relation = self._revision_relations(revision_a, revision_b, graph)
1199
if relation == 'b_descends_from_a':
1201
elif relation == 'diverged':
1202
raise errors.DivergedBranches(self, other_branch)
1203
elif relation == 'a_descends_from_b':
1206
raise AssertionError("invalid relation: %r" % (relation,))
1208
def _revision_relations(self, revision_a, revision_b, graph):
1209
"""Determine the relationship between two revisions.
1211
:returns: One of: 'a_descends_from_b', 'b_descends_from_a', 'diverged'
1213
heads = graph.heads([revision_a, revision_b])
1214
if heads == set([revision_b]):
1215
return 'b_descends_from_a'
1216
elif heads == set([revision_a, revision_b]):
1217
# These branches have diverged
1219
elif heads == set([revision_a]):
1220
return 'a_descends_from_b'
1222
raise AssertionError("invalid heads: %r" % (heads,))
1225
799
class BranchFormat(object):
1226
800
"""An encapsulation of the initialization and open routines for a format.
1344
916
"""Is this format supported?
1346
918
Supported formats can be initialized and opened.
1347
Unsupported formats may not support initialization or committing or
919
Unsupported formats may not support initialization or committing or
1348
920
some other features depending on the reason for not being supported.
1352
def make_tags(self, branch):
1353
"""Create a tags object for branch.
1355
This method is on BranchFormat, because BranchFormats are reflected
1356
over the wire via network_name(), whereas full Branch instances require
1357
multiple VFS method calls to operate at all.
1359
The default implementation returns a disabled-tags instance.
1361
Note that it is normal for branch to be a RemoteBranch when using tags
1364
return DisabledTags(branch)
1366
def network_name(self):
1367
"""A simple byte string uniquely identifying this format for RPC calls.
1369
MetaDir branch formats use their disk format string to identify the
1370
repository over the wire. All in one formats such as bzr < 0.8, and
1371
foreign formats like svn/git and hg should use some marker which is
1372
unique and immutable.
1374
raise NotImplementedError(self.network_name)
1376
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
924
def open(self, a_bzrdir, _found=False):
1377
925
"""Return the branch object for a_bzrdir
1379
:param a_bzrdir: A BzrDir that contains a branch.
1380
:param _found: a private parameter, do not use it. It is used to
1381
indicate if format probing has already be done.
1382
:param ignore_fallbacks: when set, no fallback branches will be opened
1383
(if there are any). Default is to open fallbacks.
927
_found is a private parameter, do not use it. It is used to indicate
928
if format probing has already be done.
1385
930
raise NotImplementedError(self.open)
1388
933
def register_format(klass, format):
1389
"""Register a metadir format."""
1390
934
klass._formats[format.get_format_string()] = format
1391
# Metadir formats have a network name of their format string, and get
1392
# registered as class factories.
1393
network_format_registry.register(format.get_format_string(), format.__class__)
1396
937
def set_default_format(klass, format):
1397
938
klass._default_format = format
1399
def supports_stacking(self):
1400
"""True if this format records a stacked-on branch."""
1404
941
def unregister_format(klass, format):
942
assert klass._formats[format.get_format_string()] is format
1405
943
del klass._formats[format.get_format_string()]
1407
945
def __str__(self):
1408
return self.get_format_description().rstrip()
946
return self.get_format_string().rstrip()
1410
948
def supports_tags(self):
1411
949
"""True if this format supports tags stored in the branch"""
1412
950
return False # by default
952
# XXX: Probably doesn't really belong here -- mbp 20070212
953
def _initialize_control_files(self, a_bzrdir, utf8_files, lock_filename,
955
branch_transport = a_bzrdir.get_branch_transport(self)
956
control_files = lockable_files.LockableFiles(branch_transport,
957
lock_filename, lock_class)
958
control_files.create_lock()
959
control_files.lock_write()
961
for filename, content in utf8_files:
962
control_files.put_utf8(filename, content)
964
control_files.unlock()
1415
967
class BranchHooks(Hooks):
1416
968
"""A dictionary mapping hook name to a list of callables for branch hooks.
1418
970
e.g. ['set_rh'] Is the list of items to be called when the
1419
971
set_revision_history function is invoked.
1428
980
Hooks.__init__(self)
1429
self.create_hook(HookPoint('set_rh',
1430
"Invoked whenever the revision history has been set via "
1431
"set_revision_history. The api signature is (branch, "
1432
"revision_history), and the branch will be write-locked. "
1433
"The set_rh hook can be expensive for bzr to trigger, a better "
1434
"hook to use is Branch.post_change_branch_tip.", (0, 15), None))
1435
self.create_hook(HookPoint('open',
1436
"Called with the Branch object that has been opened after a "
1437
"branch is opened.", (1, 8), None))
1438
self.create_hook(HookPoint('post_push',
1439
"Called after a push operation completes. post_push is called "
1440
"with a bzrlib.branch.BranchPushResult object and only runs in the "
1441
"bzr client.", (0, 15), None))
1442
self.create_hook(HookPoint('post_pull',
1443
"Called after a pull operation completes. post_pull is called "
1444
"with a bzrlib.branch.PullResult object and only runs in the "
1445
"bzr client.", (0, 15), None))
1446
self.create_hook(HookPoint('pre_commit',
1447
"Called after a commit is calculated but before it is is "
1448
"completed. pre_commit is called with (local, master, old_revno, "
1449
"old_revid, future_revno, future_revid, tree_delta, future_tree"
1450
"). old_revid is NULL_REVISION for the first commit to a branch, "
1451
"tree_delta is a TreeDelta object describing changes from the "
1452
"basis revision. hooks MUST NOT modify this delta. "
1453
" future_tree is an in-memory tree obtained from "
1454
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1455
"tree.", (0,91), None))
1456
self.create_hook(HookPoint('post_commit',
1457
"Called in the bzr client after a commit has completed. "
1458
"post_commit is called with (local, master, old_revno, old_revid, "
1459
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1460
"commit to a branch.", (0, 15), None))
1461
self.create_hook(HookPoint('post_uncommit',
1462
"Called in the bzr client after an uncommit completes. "
1463
"post_uncommit is called with (local, master, old_revno, "
1464
"old_revid, new_revno, new_revid) where local is the local branch "
1465
"or None, master is the target branch, and an empty branch "
1466
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1467
self.create_hook(HookPoint('pre_change_branch_tip',
1468
"Called in bzr client and server before a change to the tip of a "
1469
"branch is made. pre_change_branch_tip is called with a "
1470
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1471
"commit, uncommit will all trigger this hook.", (1, 6), None))
1472
self.create_hook(HookPoint('post_change_branch_tip',
1473
"Called in bzr client and server after a change to the tip of a "
1474
"branch is made. post_change_branch_tip is called with a "
1475
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1476
"commit, uncommit will all trigger this hook.", (1, 4), None))
1477
self.create_hook(HookPoint('transform_fallback_location',
1478
"Called when a stacked branch is activating its fallback "
1479
"locations. transform_fallback_location is called with (branch, "
1480
"url), and should return a new url. Returning the same url "
1481
"allows it to be used as-is, returning a different one can be "
1482
"used to cause the branch to stack on a closer copy of that "
1483
"fallback_location. Note that the branch cannot have history "
1484
"accessing methods called on it during this hook because the "
1485
"fallback locations have not been activated. When there are "
1486
"multiple hooks installed for transform_fallback_location, "
1487
"all are called with the url returned from the previous hook."
1488
"The order is however undefined.", (1, 9), None))
981
# Introduced in 0.15:
982
# invoked whenever the revision history has been set
983
# with set_revision_history. The api signature is
984
# (branch, revision_history), and the branch will
987
# invoked after a push operation completes.
988
# the api signature is
990
# containing the members
991
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
992
# where local is the local target branch or None, master is the target
993
# master branch, and the rest should be self explanatory. The source
994
# is read locked and the target branches write locked. Source will
995
# be the local low-latency branch.
996
self['post_push'] = []
997
# invoked after a pull operation completes.
998
# the api signature is
1000
# containing the members
1001
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1002
# where local is the local branch or None, master is the target
1003
# master branch, and the rest should be self explanatory. The source
1004
# is read locked and the target branches write locked. The local
1005
# branch is the low-latency branch.
1006
self['post_pull'] = []
1007
# invoked before a commit operation takes place.
1008
# the api signature is
1009
# (local, master, old_revno, old_revid, future_revno, future_revid,
1010
# tree_delta, future_tree).
1011
# old_revid is NULL_REVISION for the first commit to a branch
1012
# tree_delta is a TreeDelta object describing changes from the basis
1013
# revision, hooks MUST NOT modify this delta
1014
# future_tree is an in-memory tree obtained from
1015
# CommitBuilder.revision_tree() and hooks MUST NOT modify this tree
1016
self['pre_commit'] = []
1017
# invoked after a commit operation completes.
1018
# the api signature is
1019
# (local, master, old_revno, old_revid, new_revno, new_revid)
1020
# old_revid is NULL_REVISION for the first commit to a branch.
1021
self['post_commit'] = []
1022
# invoked after a uncommit operation completes.
1023
# the api signature is
1024
# (local, master, old_revno, old_revid, new_revno, new_revid) where
1025
# local is the local branch or None, master is the target branch,
1026
# and an empty branch recieves new_revno of 0, new_revid of None.
1027
self['post_uncommit'] = []
1491
1030
# install the default hooks into the Branch class.
1492
1031
Branch.hooks = BranchHooks()
1495
class ChangeBranchTipParams(object):
1496
"""Object holding parameters passed to *_change_branch_tip hooks.
1498
There are 5 fields that hooks may wish to access:
1500
:ivar branch: the branch being changed
1501
:ivar old_revno: revision number before the change
1502
:ivar new_revno: revision number after the change
1503
:ivar old_revid: revision id before the change
1504
:ivar new_revid: revision id after the change
1506
The revid fields are strings. The revno fields are integers.
1509
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1510
"""Create a group of ChangeBranchTip parameters.
1512
:param branch: The branch being changed.
1513
:param old_revno: Revision number before the change.
1514
:param new_revno: Revision number after the change.
1515
:param old_revid: Tip revision id before the change.
1516
:param new_revid: Tip revision id after the change.
1518
self.branch = branch
1519
self.old_revno = old_revno
1520
self.new_revno = new_revno
1521
self.old_revid = old_revid
1522
self.new_revid = new_revid
1524
def __eq__(self, other):
1525
return self.__dict__ == other.__dict__
1528
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1529
self.__class__.__name__, self.branch,
1530
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1533
1034
class BzrBranchFormat4(BranchFormat):
1534
1035
"""Bzr branch format 4.
1680
1154
return self._initialize_helper(a_bzrdir, utf8_files)
1682
def make_tags(self, branch):
1683
"""See bzrlib.branch.BranchFormat.make_tags()."""
1684
return BasicTags(branch)
1688
class BzrBranchFormat7(BranchFormatMetadir):
1689
"""Branch format with last-revision, tags, and a stacked location pointer.
1691
The stacked location pointer is passed down to the repository and requires
1692
a repository format with supports_external_lookups = True.
1694
This format was introduced in bzr 1.6.
1697
def _branch_class(self):
1700
def get_format_string(self):
1701
"""See BranchFormat.get_format_string()."""
1702
return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
1704
def get_format_description(self):
1705
"""See BranchFormat.get_format_description()."""
1706
return "Branch format 7"
1708
def initialize(self, a_bzrdir):
1709
"""Create a branch of this format in a_bzrdir."""
1710
utf8_files = [('last-revision', '0 null:\n'),
1711
('branch.conf', ''),
1714
return self._initialize_helper(a_bzrdir, utf8_files)
1717
super(BzrBranchFormat7, self).__init__()
1718
self._matchingbzrdir.repository_format = \
1719
RepositoryFormatKnitPack5RichRoot()
1721
def make_tags(self, branch):
1722
"""See bzrlib.branch.BranchFormat.make_tags()."""
1723
return BasicTags(branch)
1725
def supports_stacking(self):
1156
def open(self, a_bzrdir, _found=False):
1157
"""Return the branch object for a_bzrdir
1159
_found is a private parameter, do not use it. It is used to indicate
1160
if format probing has already be done.
1163
format = BranchFormat.find_format(a_bzrdir)
1164
assert format.__class__ == self.__class__
1165
transport = a_bzrdir.get_branch_transport(None)
1166
control_files = lockable_files.LockableFiles(transport, 'lock',
1168
return BzrBranch6(_format=self,
1169
_control_files=control_files,
1171
_repository=a_bzrdir.find_repository())
1173
def supports_tags(self):
1853
1276
Note that it's "local" in the context of the filesystem; it doesn't
1854
1277
really matter if it's on an nfs/smb/afs/coda/... share, as long as
1855
1278
it's writable, and can be accessed via the normal filesystem API.
1857
:ivar _transport: Transport for file operations on this branch's
1858
control files, typically pointing to the .bzr/branch directory.
1859
:ivar repository: Repository for this branch.
1860
:ivar base: The url of the base directory for this branch; the one
1861
containing the .bzr directory.
1864
1281
def __init__(self, _format=None,
1865
_control_files=None, a_bzrdir=None, _repository=None,
1866
ignore_fallbacks=False):
1282
_control_files=None, a_bzrdir=None, _repository=None):
1867
1283
"""Create new branch object at a particular location."""
1284
Branch.__init__(self)
1868
1285
if a_bzrdir is None:
1869
1286
raise ValueError('a_bzrdir must be supplied')
1871
1288
self.bzrdir = a_bzrdir
1289
# self._transport used to point to the directory containing the
1290
# control directory, but was not used - now it's just the transport
1291
# for the branch control files. mbp 20070212
1872
1292
self._base = self.bzrdir.transport.clone('..').base
1873
# XXX: We should be able to just do
1874
# self.base = self.bzrdir.root_transport.base
1875
# but this does not quite work yet -- mbp 20080522
1876
1293
self._format = _format
1877
1294
if _control_files is None:
1878
1295
raise ValueError('BzrBranch _control_files is None')
1879
1296
self.control_files = _control_files
1880
1297
self._transport = _control_files._transport
1881
1298
self.repository = _repository
1882
Branch.__init__(self)
1884
1300
def __str__(self):
1885
1301
return '%s(%r)' % (self.__class__.__name__, self.base)
1945
1370
This performs the actual writing to disk.
1946
1371
It is intended to be called by BzrBranch5.set_revision_history."""
1947
self._transport.put_bytes(
1948
'revision-history', '\n'.join(history),
1949
mode=self.bzrdir._get_file_mode())
1372
self.control_files.put_bytes(
1373
'revision-history', '\n'.join(history))
1951
1375
@needs_write_lock
1952
1376
def set_revision_history(self, rev_history):
1953
1377
"""See Branch.set_revision_history."""
1954
1378
if 'evil' in debug.debug_flags:
1955
1379
mutter_callsite(3, "set_revision_history scales with history.")
1956
check_not_reserved_id = _mod_revision.check_not_reserved_id
1957
for rev_id in rev_history:
1958
check_not_reserved_id(rev_id)
1959
if Branch.hooks['post_change_branch_tip']:
1960
# Don't calculate the last_revision_info() if there are no hooks
1962
old_revno, old_revid = self.last_revision_info()
1963
if len(rev_history) == 0:
1964
revid = _mod_revision.NULL_REVISION
1966
revid = rev_history[-1]
1967
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
1380
self._clear_cached_state()
1968
1381
self._write_revision_history(rev_history)
1969
self._clear_cached_state()
1970
1382
self._cache_revision_history(rev_history)
1971
1383
for hook in Branch.hooks['set_rh']:
1972
1384
hook(self, rev_history)
1973
if Branch.hooks['post_change_branch_tip']:
1974
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
1976
def _synchronize_history(self, destination, revision_id):
1977
"""Synchronize last revision and revision history between branches.
1979
This version is most efficient when the destination is also a
1980
BzrBranch5, but works for BzrBranch6 as long as the revision
1981
history is the true lefthand parent history, and all of the revisions
1982
are in the destination's repository. If not, set_revision_history
1985
:param destination: The branch to copy the history into
1986
:param revision_id: The revision-id to truncate history at. May
1987
be None to copy complete history.
1989
if not isinstance(destination._format, BzrBranchFormat5):
1990
super(BzrBranch, self)._synchronize_history(
1991
destination, revision_id)
1993
if revision_id == _mod_revision.NULL_REVISION:
1996
new_history = self.revision_history()
1997
if revision_id is not None and new_history != []:
1999
new_history = new_history[:new_history.index(revision_id) + 1]
2001
rev = self.repository.get_revision(revision_id)
2002
new_history = rev.get_history(self.repository)[1:]
2003
destination.set_revision_history(new_history)
2005
1386
@needs_write_lock
2006
1387
def set_last_revision_info(self, revno, revision_id):
2010
1391
for this revision id.
2012
1393
It may be possible to set the branch last revision to an id not
2013
present in the repository. However, branches can also be
1394
present in the repository. However, branches can also be
2014
1395
configured to check constraints on history, in which case this may not
2017
1398
revision_id = _mod_revision.ensure_null(revision_id)
2018
# this old format stores the full history, but this api doesn't
2019
# provide it, so we must generate, and might as well check it's
2021
1399
history = self._lefthand_history(revision_id)
2022
if len(history) != revno:
2023
raise AssertionError('%d != %d' % (len(history), revno))
1400
assert len(history) == revno, '%d != %d' % (len(history), revno)
2024
1401
self.set_revision_history(history)
2026
1403
def _gen_revision_history(self):
2027
history = self._transport.get_bytes('revision-history').split('\n')
1404
history = self.control_files.get('revision-history').read().split('\n')
2028
1405
if history[-1:] == ['']:
2029
1406
# There shouldn't be a trailing newline, but just in case.
1410
def _lefthand_history(self, revision_id, last_rev=None,
1412
if 'evil' in debug.debug_flags:
1413
mutter_callsite(4, "_lefthand_history scales with history.")
1414
# stop_revision must be a descendant of last_revision
1415
graph = self.repository.get_graph()
1416
if last_rev is not None:
1417
if not graph.is_ancestor(last_rev, revision_id):
1418
# our previous tip is not merged into stop_revision
1419
raise errors.DivergedBranches(self, other_branch)
1420
# make a new revision history from the graph
1421
parents_map = graph.get_parent_map([revision_id])
1422
if revision_id not in parents_map:
1423
raise errors.NoSuchRevision(self, revision_id)
1424
current_rev_id = revision_id
1426
# Do not include ghosts or graph origin in revision_history
1427
while (current_rev_id in parents_map and
1428
len(parents_map[current_rev_id]) > 0):
1429
new_history.append(current_rev_id)
1430
current_rev_id = parents_map[current_rev_id][0]
1431
parents_map = graph.get_parent_map([current_rev_id])
1432
new_history.reverse()
2033
1435
@needs_write_lock
2034
1436
def generate_revision_history(self, revision_id, last_rev=None,
2035
1437
other_branch=None):
2044
1446
self.set_revision_history(self._lefthand_history(revision_id,
2045
1447
last_rev, other_branch))
1450
def update_revisions(self, other, stop_revision=None, overwrite=False):
1451
"""See Branch.update_revisions."""
1454
other_last_revno, other_last_revision = other.last_revision_info()
1455
if stop_revision is None:
1456
stop_revision = other_last_revision
1457
if _mod_revision.is_null(stop_revision):
1458
# if there are no commits, we're done.
1460
# whats the current last revision, before we fetch [and change it
1462
last_rev = _mod_revision.ensure_null(self.last_revision())
1463
# we fetch here so that we don't process data twice in the common
1464
# case of having something to pull, and so that the check for
1465
# already merged can operate on the just fetched graph, which will
1466
# be cached in memory.
1467
self.fetch(other, stop_revision)
1468
# Check to see if one is an ancestor of the other
1470
heads = self.repository.get_graph().heads([stop_revision,
1472
if heads == set([last_rev]):
1473
# The current revision is a decendent of the target,
1476
elif heads == set([stop_revision, last_rev]):
1477
# These branches have diverged
1478
raise errors.DivergedBranches(self, other)
1479
assert heads == set([stop_revision])
1480
if other_last_revision == stop_revision:
1481
self.set_last_revision_info(other_last_revno,
1482
other_last_revision)
1484
# TODO: jam 2007-11-29 Is there a way to determine the
1485
# revno without searching all of history??
1487
self.generate_revision_history(stop_revision)
1489
self.generate_revision_history(stop_revision,
1490
last_rev=last_rev, other_branch=other)
2047
1494
def basis_tree(self):
2048
1495
"""See Branch.basis_tree."""
2049
1496
return self.repository.revision_tree(self.last_revision())
2051
1498
@needs_write_lock
2052
1499
def pull(self, source, overwrite=False, stop_revision=None,
2053
_hook_master=None, run_hooks=True, possible_transports=None,
2054
_override_hook_target=None):
1500
_hook_master=None, run_hooks=True, possible_transports=None):
2055
1501
"""See Branch.pull.
2057
:param _hook_master: Private parameter - set the branch to
2058
be supplied as the master to pull hooks.
1503
:param _hook_master: Private parameter - set the branch to
1504
be supplied as the master to push hooks.
2059
1505
:param run_hooks: Private parameter - if false, this branch
2060
1506
is being called because it's the master of the primary branch,
2061
1507
so it should not run its hooks.
2062
:param _override_hook_target: Private parameter - set the branch to be
2063
supplied as the target_branch to pull hooks.
2065
1509
result = PullResult()
2066
1510
result.source_branch = source
2067
if _override_hook_target is None:
2068
result.target_branch = self
2070
result.target_branch = _override_hook_target
1511
result.target_branch = self
2071
1512
source.lock_read()
2073
# We assume that during 'pull' the local repository is closer than
2075
graph = self.repository.get_graph(source.repository)
2076
1514
result.old_revno, result.old_revid = self.last_revision_info()
2077
self.update_revisions(source, stop_revision, overwrite=overwrite,
1515
self.update_revisions(source, stop_revision, overwrite=overwrite)
2079
1516
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
2080
1517
result.new_revno, result.new_revid = self.last_revision_info()
2081
1518
if _hook_master:
2082
1519
result.master_branch = _hook_master
2083
result.local_branch = result.target_branch
1520
result.local_branch = self
2085
result.master_branch = result.target_branch
1522
result.master_branch = self
2086
1523
result.local_branch = None
2088
1525
for hook in Branch.hooks['post_pull']:
2171
1612
Must be called with self read locked and target write locked.
2173
result = BranchPushResult()
1614
result = PushResult()
2174
1615
result.source_branch = self
2175
1616
result.target_branch = target
2176
1617
result.old_revno, result.old_revid = target.last_revision_info()
2177
if result.old_revid != self.last_revision():
2178
# We assume that during 'push' this repository is closer than
2180
graph = self.repository.get_graph(target.repository)
2181
target.update_revisions(self, stop_revision, overwrite=overwrite,
2183
if self._push_should_merge_tags():
2184
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
1619
target.update_revisions(self, stop_revision)
1620
except errors.DivergedBranches:
1624
target.set_revision_history(self.revision_history())
1625
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
2185
1626
result.new_revno, result.new_revid = target.last_revision_info()
2188
def get_stacked_on_url(self):
2189
raise errors.UnstackableBranchFormat(self._format, self.base)
1629
def get_parent(self):
1630
"""See Branch.get_parent."""
1632
assert self.base[-1] == '/'
1633
parent = self._get_parent_location()
1636
# This is an old-format absolute path to a local branch
1637
# turn it into a url
1638
if parent.startswith('/'):
1639
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1641
return urlutils.join(self.base[:-1], parent)
1642
except errors.InvalidURLJoin, e:
1643
raise errors.InaccessibleParent(parent, self.base)
2191
1645
def set_push_location(self, location):
2192
1646
"""See Branch.set_push_location."""
2350
class BzrBranch7(BzrBranch5):
2351
"""A branch with support for a fallback repository."""
2353
def _open_hook(self):
2354
if self._ignore_fallbacks:
2357
url = self.get_stacked_on_url()
2358
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2359
errors.UnstackableBranchFormat):
2362
for hook in Branch.hooks['transform_fallback_location']:
2363
url = hook(self, url)
2365
hook_name = Branch.hooks.get_hook_name(hook)
2366
raise AssertionError(
2367
"'transform_fallback_location' hook %s returned "
2368
"None, not a URL." % hook_name)
2369
self._activate_fallback_location(url)
2371
def __init__(self, *args, **kwargs):
2372
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2373
super(BzrBranch7, self).__init__(*args, **kwargs)
2374
self._last_revision_info_cache = None
2375
self._partial_revision_history_cache = []
2377
def _clear_cached_state(self):
2378
super(BzrBranch7, self)._clear_cached_state()
2379
self._last_revision_info_cache = None
2380
self._partial_revision_history_cache = []
2382
def _last_revision_info(self):
2383
revision_string = self._transport.get_bytes('last-revision')
1812
class BzrBranch6(BzrBranch5):
1815
def last_revision_info(self):
1816
revision_string = self.control_files.get('last-revision').read()
2384
1817
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2385
1818
revision_id = cache_utf8.get_cached_utf8(revision_id)
2386
1819
revno = int(revno)
2395
1828
Intended to be called by set_last_revision_info and
2396
1829
_write_revision_history.
2398
revision_id = _mod_revision.ensure_null(revision_id)
1831
assert revision_id is not None, "Use NULL_REVISION, not None"
2399
1832
out_string = '%d %s\n' % (revno, revision_id)
2400
self._transport.put_bytes('last-revision', out_string,
2401
mode=self.bzrdir._get_file_mode())
1833
self.control_files.put_bytes('last-revision', out_string)
2403
1835
@needs_write_lock
2404
1836
def set_last_revision_info(self, revno, revision_id):
2405
1837
revision_id = _mod_revision.ensure_null(revision_id)
2406
old_revno, old_revid = self.last_revision_info()
2407
1838
if self._get_append_revisions_only():
2408
1839
self._check_history_violation(revision_id)
2409
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2410
1840
self._write_last_revision_info(revno, revision_id)
2411
1841
self._clear_cached_state()
2412
self._last_revision_info_cache = revno, revision_id
2413
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2415
def _synchronize_history(self, destination, revision_id):
2416
"""Synchronize last revision and revision history between branches.
2418
:see: Branch._synchronize_history
2420
# XXX: The base Branch has a fast implementation of this method based
2421
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2422
# that uses set_revision_history. This class inherits from BzrBranch5,
2423
# but wants the fast implementation, so it calls
2424
# Branch._synchronize_history directly.
2425
Branch._synchronize_history(self, destination, revision_id)
2427
1843
def _check_history_violation(self, revision_id):
2428
1844
last_revision = _mod_revision.ensure_null(self.last_revision())
2434
1850
def _gen_revision_history(self):
2435
1851
"""Generate the revision history from last revision
2437
last_revno, last_revision = self.last_revision_info()
2438
self._extend_partial_history(stop_index=last_revno-1)
2439
return list(reversed(self._partial_revision_history_cache))
2441
def _extend_partial_history(self, stop_index=None, stop_revision=None):
2442
"""Extend the partial history to include a given index
2444
If a stop_index is supplied, stop when that index has been reached.
2445
If a stop_revision is supplied, stop when that revision is
2446
encountered. Otherwise, stop when the beginning of history is
2449
:param stop_index: The index which should be present. When it is
2450
present, history extension will stop.
2451
:param revision_id: The revision id which should be present. When
2452
it is encountered, history extension will stop.
2454
repo = self.repository
2455
if len(self._partial_revision_history_cache) == 0:
2456
iterator = repo.iter_reverse_revision_history(self.last_revision())
2458
start_revision = self._partial_revision_history_cache[-1]
2459
iterator = repo.iter_reverse_revision_history(start_revision)
2460
#skip the last revision in the list
2461
next_revision = iterator.next()
2462
for revision_id in iterator:
2463
self._partial_revision_history_cache.append(revision_id)
2464
if (stop_index is not None and
2465
len(self._partial_revision_history_cache) > stop_index):
2467
if revision_id == stop_revision:
1853
history = list(self.repository.iter_reverse_revision_history(
1854
self.last_revision()))
2470
1858
def _write_revision_history(self, history):
2471
1859
"""Factored out of set_revision_history.
2552
1931
value = self.get_config().get_user_option('append_revisions_only')
2553
1932
return value == 'True'
1934
def _synchronize_history(self, destination, revision_id):
1935
"""Synchronize last revision and revision history between branches.
1937
This version is most efficient when the destination is also a
1938
BzrBranch6, but works for BzrBranch5, as long as the destination's
1939
repository contains all the lefthand ancestors of the intended
1940
last_revision. If not, set_last_revision_info will fail.
1942
:param destination: The branch to copy the history into
1943
:param revision_id: The revision-id to truncate history at. May
1944
be None to copy complete history.
1946
source_revno, source_revision_id = self.last_revision_info()
1947
if revision_id is None:
1948
revno, revision_id = source_revno, source_revision_id
1949
elif source_revision_id == revision_id:
1950
# we know the revno without needing to walk all of history
1951
revno = source_revno
1953
# To figure out the revno for a random revision, we need to build
1954
# the revision history, and count its length.
1955
# We don't care about the order, just how long it is.
1956
# Alternatively, we could start at the current location, and count
1957
# backwards. But there is no guarantee that we will find it since
1958
# it may be a merged revision.
1959
revno = len(list(self.repository.iter_reverse_revision_history(
1961
destination.set_last_revision_info(revno, revision_id)
1963
def _make_tags(self):
1964
return BasicTags(self)
2555
1966
@needs_write_lock
2556
1967
def generate_revision_history(self, revision_id, last_rev=None,
2557
1968
other_branch=None):
2560
1971
revno = len(history)
2561
1972
self.set_last_revision_info(revno, revision_id)
2564
def get_rev_id(self, revno, history=None):
2565
"""Find the revision id of the specified revno."""
2567
return _mod_revision.NULL_REVISION
2569
last_revno, last_revision_id = self.last_revision_info()
2570
if revno <= 0 or revno > last_revno:
2571
raise errors.NoSuchRevision(self, revno)
2573
if history is not None:
2574
return history[revno - 1]
2576
index = last_revno - revno
2577
if len(self._partial_revision_history_cache) <= index:
2578
self._extend_partial_history(stop_index=index)
2579
if len(self._partial_revision_history_cache) > index:
2580
return self._partial_revision_history_cache[index]
2582
raise errors.NoSuchRevision(self, revno)
2585
def revision_id_to_revno(self, revision_id):
2586
"""Given a revision id, return its revno"""
2587
if _mod_revision.is_null(revision_id):
2590
index = self._partial_revision_history_cache.index(revision_id)
2592
self._extend_partial_history(stop_revision=revision_id)
2593
index = len(self._partial_revision_history_cache) - 1
2594
if self._partial_revision_history_cache[index] != revision_id:
2595
raise errors.NoSuchRevision(self, revision_id)
2596
return self.revno() - index
2599
class BzrBranch6(BzrBranch7):
2600
"""See BzrBranchFormat6 for the capabilities of this branch.
2602
This subclass of BzrBranch7 disables the new features BzrBranch7 added,
2606
def get_stacked_on_url(self):
2607
raise errors.UnstackableBranchFormat(self._format, self.base)
2610
1975
######################################################################
2611
1976
# results of operations
2719
2074
new_branch.tags._set_tag_dict({})
2721
2076
# Copying done; now update target format
2722
new_branch._transport.put_bytes('format',
2723
format.get_format_string(),
2724
mode=new_branch.bzrdir._get_file_mode())
2077
new_branch.control_files.put_utf8('format',
2078
format.get_format_string())
2726
2080
# Clean up old files
2727
new_branch._transport.delete('revision-history')
2081
new_branch.control_files._transport.delete('revision-history')
2729
2083
branch.set_parent(None)
2730
2084
except errors.NoSuchFile:
2732
2086
branch.set_bound_location(None)
2735
class Converter6to7(object):
2736
"""Perform an in-place upgrade of format 6 to format 7"""
2738
def convert(self, branch):
2739
format = BzrBranchFormat7()
2740
branch._set_config_location('stacked_on_location', '')
2741
# update target format
2742
branch._transport.put_bytes('format', format.get_format_string())
2746
def _run_with_write_locked_target(target, callable, *args, **kwargs):
2747
"""Run ``callable(*args, **kwargs)``, write-locking target for the
2750
_run_with_write_locked_target will attempt to release the lock it acquires.
2752
If an exception is raised by callable, then that exception *will* be
2753
propagated, even if the unlock attempt raises its own error. Thus
2754
_run_with_write_locked_target should be preferred to simply doing::
2758
return callable(*args, **kwargs)
2763
# This is very similar to bzrlib.decorators.needs_write_lock. Perhaps they
2764
# should share code?
2767
result = callable(*args, **kwargs)
2769
exc_info = sys.exc_info()
2773
raise exc_info[0], exc_info[1], exc_info[2]
2779
class InterBranch(InterObject):
2780
"""This class represents operations taking place between two branches.
2782
Its instances have methods like pull() and push() and contain
2783
references to the source and target repositories these operations
2784
can be carried out on.
2788
"""The available optimised InterBranch types."""
2791
def _get_branch_formats_to_test():
2792
"""Return a tuple with the Branch formats to use when testing."""
2793
raise NotImplementedError(self._get_branch_formats_to_test)
2795
def update_revisions(self, stop_revision=None, overwrite=False,
2797
"""Pull in new perfect-fit revisions.
2799
:param stop_revision: Updated until the given revision
2800
:param overwrite: Always set the branch pointer, rather than checking
2801
to see if it is a proper descendant.
2802
:param graph: A Graph object that can be used to query history
2803
information. This can be None.
2806
raise NotImplementedError(self.update_revisions)
2809
class GenericInterBranch(InterBranch):
2810
"""InterBranch implementation that uses public Branch functions.
2814
def _get_branch_formats_to_test():
2815
return BranchFormat._default_format, BranchFormat._default_format
2817
def update_revisions(self, stop_revision=None, overwrite=False,
2819
"""See InterBranch.update_revisions()."""
2820
self.source.lock_read()
2822
other_revno, other_last_revision = self.source.last_revision_info()
2823
stop_revno = None # unknown
2824
if stop_revision is None:
2825
stop_revision = other_last_revision
2826
if _mod_revision.is_null(stop_revision):
2827
# if there are no commits, we're done.
2829
stop_revno = other_revno
2831
# what's the current last revision, before we fetch [and change it
2833
last_rev = _mod_revision.ensure_null(self.target.last_revision())
2834
# we fetch here so that we don't process data twice in the common
2835
# case of having something to pull, and so that the check for
2836
# already merged can operate on the just fetched graph, which will
2837
# be cached in memory.
2838
self.target.fetch(self.source, stop_revision)
2839
# Check to see if one is an ancestor of the other
2842
graph = self.target.repository.get_graph()
2843
if self.target._check_if_descendant_or_diverged(
2844
stop_revision, last_rev, graph, self.source):
2845
# stop_revision is a descendant of last_rev, but we aren't
2846
# overwriting, so we're done.
2848
if stop_revno is None:
2850
graph = self.target.repository.get_graph()
2851
this_revno, this_last_revision = \
2852
self.target.last_revision_info()
2853
stop_revno = graph.find_distance_to_null(stop_revision,
2854
[(other_last_revision, other_revno),
2855
(this_last_revision, this_revno)])
2856
self.target.set_last_revision_info(stop_revno, stop_revision)
2858
self.source.unlock()
2861
def is_compatible(self, source, target):
2862
# GenericBranch uses the public API, so always compatible
2866
InterBranch.register_optimiser(GenericInterBranch)
added
removed
bzrlib/branch.py
