278
335
The delta is relative to its mainline predecessor, or the
279
336
empty tree for revision 1.
281
assert isinstance(revno, int)
282
338
rh = self.revision_history()
283
339
if not (1 <= revno <= len(rh)):
284
raise InvalidRevisionNumber(revno)
340
raise errors.InvalidRevisionNumber(revno)
285
341
return self.repository.get_revision_delta(rh[revno-1])
287
def get_root_id(self):
288
"""Return the id of this branches root"""
289
raise NotImplementedError(self.get_root_id)
343
def get_stacked_on_url(self):
344
"""Get the URL this branch is stacked against.
346
:raises NotStacked: If the branch is not stacked.
347
:raises UnstackableBranchFormat: If the branch does not support
350
raise NotImplementedError(self.get_stacked_on_url)
291
352
def print_file(self, file, revision_id):
292
353
"""Print `file` to stdout."""
293
354
raise NotImplementedError(self.print_file)
295
def append_revision(self, *revision_ids):
296
raise NotImplementedError(self.append_revision)
298
356
def set_revision_history(self, rev_history):
299
357
raise NotImplementedError(self.set_revision_history)
359
def set_stacked_on_url(self, url):
360
"""Set the URL this branch is stacked against.
362
:raises UnstackableBranchFormat: If the branch does not support
364
:raises UnstackableRepositoryFormat: If the repository does not support
367
raise NotImplementedError(self.set_stacked_on_url)
369
def _cache_revision_history(self, rev_history):
370
"""Set the cached revision history to rev_history.
372
The revision_history method will use this cache to avoid regenerating
373
the revision history.
375
This API is semi-public; it only for use by subclasses, all other code
376
should consider it to be private.
378
self._revision_history_cache = rev_history
380
def _cache_revision_id_to_revno(self, revision_id_to_revno):
381
"""Set the cached revision_id => revno map to revision_id_to_revno.
383
This API is semi-public; it only for use by subclasses, all other code
384
should consider it to be private.
386
self._revision_id_to_revno_cache = revision_id_to_revno
388
def _clear_cached_state(self):
389
"""Clear any cached data on this branch, e.g. cached revision history.
391
This means the next call to revision_history will need to call
392
_gen_revision_history.
394
This API is semi-public; it only for use by subclasses, all other code
395
should consider it to be private.
397
self._revision_history_cache = None
398
self._revision_id_to_revno_cache = None
399
self._last_revision_info_cache = None
401
def _gen_revision_history(self):
402
"""Return sequence of revision hashes on to this branch.
404
Unlike revision_history, this method always regenerates or rereads the
405
revision history, i.e. it does not cache the result, so repeated calls
408
Concrete subclasses should override this instead of revision_history so
409
that subclasses do not need to deal with caching logic.
411
This API is semi-public; it only for use by subclasses, all other code
412
should consider it to be private.
414
raise NotImplementedError(self._gen_revision_history)
301
417
def revision_history(self):
302
"""Return sequence of revision hashes on to this branch."""
303
raise NotImplementedError(self.revision_history)
418
"""Return sequence of revision ids on this branch.
420
This method will cache the revision history for as long as it is safe to
423
if 'evil' in debug.debug_flags:
424
mutter_callsite(3, "revision_history scales with history.")
425
if self._revision_history_cache is not None:
426
history = self._revision_history_cache
428
history = self._gen_revision_history()
429
self._cache_revision_history(history)
306
433
"""Return current revision number for this branch.
335
481
common_index = min(self_len, other_len) -1
336
482
if common_index >= 0 and \
337
483
self_history[common_index] != other_history[common_index]:
338
raise DivergedBranches(self, other)
484
raise errors.DivergedBranches(self, other)
340
486
if stop_revision is None:
341
487
stop_revision = other_len
343
assert isinstance(stop_revision, int)
344
489
if stop_revision > other_len:
345
490
raise errors.NoSuchRevision(self, stop_revision)
346
491
return other_history[self_len:stop_revision]
348
def update_revisions(self, other, stop_revision=None):
494
def update_revisions(self, other, stop_revision=None, overwrite=False,
349
496
"""Pull in new perfect-fit revisions.
351
498
:param other: Another Branch to pull from
352
499
:param stop_revision: Updated until the given revision
500
:param overwrite: Always set the branch pointer, rather than checking
501
to see if it is a proper descendant.
502
:param graph: A Graph object that can be used to query history
503
information. This can be None.
355
raise NotImplementedError(self.update_revisions)
508
other_revno, other_last_revision = other.last_revision_info()
509
stop_revno = None # unknown
510
if stop_revision is None:
511
stop_revision = other_last_revision
512
if _mod_revision.is_null(stop_revision):
513
# if there are no commits, we're done.
515
stop_revno = other_revno
517
# what's the current last revision, before we fetch [and change it
519
last_rev = _mod_revision.ensure_null(self.last_revision())
520
# we fetch here so that we don't process data twice in the common
521
# case of having something to pull, and so that the check for
522
# already merged can operate on the just fetched graph, which will
523
# be cached in memory.
524
self.fetch(other, stop_revision)
525
# Check to see if one is an ancestor of the other
528
graph = self.repository.get_graph()
529
if self._check_if_descendant_or_diverged(
530
stop_revision, last_rev, graph, other):
531
# stop_revision is a descendant of last_rev, but we aren't
532
# overwriting, so we're done.
534
if stop_revno is None:
536
graph = self.repository.get_graph()
537
this_revno, this_last_revision = self.last_revision_info()
538
stop_revno = graph.find_distance_to_null(stop_revision,
539
[(other_last_revision, other_revno),
540
(this_last_revision, this_revno)])
541
self.set_last_revision_info(stop_revno, stop_revision)
357
545
def revision_id_to_revno(self, revision_id):
358
546
"""Given a revision id, return its revno"""
359
if revision_id is None:
547
if _mod_revision.is_null(revision_id):
361
549
history = self.revision_history()
363
551
return history.index(revision_id) + 1
364
552
except ValueError:
365
raise bzrlib.errors.NoSuchRevision(self, revision_id)
553
raise errors.NoSuchRevision(self, revision_id)
367
555
def get_rev_id(self, revno, history=None):
368
556
"""Find the revision id of the specified revno."""
558
return _mod_revision.NULL_REVISION
371
559
if history is None:
372
560
history = self.revision_history()
373
561
if revno <= 0 or revno > len(history):
374
raise bzrlib.errors.NoSuchRevision(self, revno)
562
raise errors.NoSuchRevision(self, revno)
375
563
return history[revno - 1]
377
def pull(self, source, overwrite=False, stop_revision=None):
565
def pull(self, source, overwrite=False, stop_revision=None,
566
possible_transports=None, _override_hook_target=None):
567
"""Mirror source into this branch.
569
This branch is considered to be 'local', having low latency.
571
:returns: PullResult instance
378
573
raise NotImplementedError(self.pull)
575
def push(self, target, overwrite=False, stop_revision=None):
576
"""Mirror this branch into target.
578
This branch is considered to be 'local', having low latency.
580
raise NotImplementedError(self.push)
380
582
def basis_tree(self):
381
583
"""Return `Tree` object for last revision."""
382
584
return self.repository.revision_tree(self.last_revision())
384
def rename_one(self, from_rel, to_rel):
387
This can change the directory or the filename or both.
389
raise NotImplementedError(self.rename_one)
391
def move(self, from_paths, to_name):
394
to_name must exist as a versioned directory.
396
If to_name exists and is a directory, the files are moved into
397
it, keeping their old names. If it is a directory,
399
Note that to_name is only the last component of the new name;
400
this doesn't change the directory.
402
This returns a list of (from_path, to_path) pairs for each
405
raise NotImplementedError(self.move)
407
586
def get_parent(self):
408
587
"""Return the parent location of the branch.
464
679
Zero (the NULL revision) is considered invalid
466
681
if revno < 1 or revno > self.revno():
467
raise InvalidRevisionNumber(revno)
682
raise errors.InvalidRevisionNumber(revno)
470
def clone(self, *args, **kwargs):
685
def clone(self, to_bzrdir, revision_id=None):
471
686
"""Clone this branch into to_bzrdir preserving all semantic values.
473
688
revision_id: if not None, the revision history in the new branch will
474
689
be truncated to end with revision_id.
476
# for API compatibility, until 0.8 releases we provide the old api:
477
# def clone(self, to_location, revision=None, basis_branch=None, to_branch_format=None):
478
# after 0.8 releases, the *args and **kwargs should be changed:
479
# def clone(self, to_bzrdir, revision_id=None):
480
if (kwargs.get('to_location', None) or
481
kwargs.get('revision', None) or
482
kwargs.get('basis_branch', None) or
483
(len(args) and isinstance(args[0], basestring))):
484
# backwards compatibility api:
485
warn("Branch.clone() has been deprecated for BzrDir.clone() from"
486
" bzrlib 0.8.", DeprecationWarning, stacklevel=3)
489
basis_branch = args[2]
491
basis_branch = kwargs.get('basis_branch', None)
493
basis = basis_branch.bzrdir
498
revision_id = args[1]
500
revision_id = kwargs.get('revision', None)
505
# no default to raise if not provided.
506
url = kwargs.get('to_location')
507
return self.bzrdir.clone(url,
508
revision_id=revision_id,
509
basis=basis).open_branch()
511
# generate args by hand
513
revision_id = args[1]
515
revision_id = kwargs.get('revision_id', None)
519
# no default to raise if not provided.
520
to_bzrdir = kwargs.get('to_bzrdir')
521
result = self._format.initialize(to_bzrdir)
691
result = to_bzrdir.create_branch()
522
692
self.copy_content_into(result, revision_id=revision_id)
526
696
def sprout(self, to_bzrdir, revision_id=None):
527
697
"""Create a new line of development from the branch, into to_bzrdir.
699
to_bzrdir controls the branch format.
529
701
revision_id: if not None, the revision history in the new branch will
530
702
be truncated to end with revision_id.
532
result = self._format.initialize(to_bzrdir)
704
result = to_bzrdir.create_branch()
533
705
self.copy_content_into(result, revision_id=revision_id)
534
706
result.set_parent(self.bzrdir.root_transport.base)
709
def _synchronize_history(self, destination, revision_id):
710
"""Synchronize last revision and revision history between branches.
712
This version is most efficient when the destination is also a
713
BzrBranch6, but works for BzrBranch5, as long as the destination's
714
repository contains all the lefthand ancestors of the intended
715
last_revision. If not, set_last_revision_info will fail.
717
:param destination: The branch to copy the history into
718
:param revision_id: The revision-id to truncate history at. May
719
be None to copy complete history.
721
source_revno, source_revision_id = self.last_revision_info()
722
if revision_id is None:
723
revno, revision_id = source_revno, source_revision_id
724
elif source_revision_id == revision_id:
725
# we know the revno without needing to walk all of history
728
# To figure out the revno for a random revision, we need to build
729
# the revision history, and count its length.
730
# We don't care about the order, just how long it is.
731
# Alternatively, we could start at the current location, and count
732
# backwards. But there is no guarantee that we will find it since
733
# it may be a merged revision.
734
revno = len(list(self.repository.iter_reverse_revision_history(
736
destination.set_last_revision_info(revno, revision_id)
538
739
def copy_content_into(self, destination, revision_id=None):
539
740
"""Copy the content of self into destination.
707
1052
def set_default_format(klass, format):
708
1053
klass._default_format = format
1055
def supports_stacking(self):
1056
"""True if this format records a stacked-on branch."""
711
1060
def unregister_format(klass, format):
712
assert klass._formats[format.get_format_string()] is format
713
1061
del klass._formats[format.get_format_string()]
715
1063
def __str__(self):
716
1064
return self.get_format_string().rstrip()
1066
def supports_tags(self):
1067
"""True if this format supports tags stored in the branch"""
1068
return False # by default
1071
class BranchHooks(Hooks):
1072
"""A dictionary mapping hook name to a list of callables for branch hooks.
1074
e.g. ['set_rh'] Is the list of items to be called when the
1075
set_revision_history function is invoked.
1079
"""Create the default hooks.
1081
These are all empty initially, because by default nothing should get
1084
Hooks.__init__(self)
1085
# Introduced in 0.15:
1086
# invoked whenever the revision history has been set
1087
# with set_revision_history. The api signature is
1088
# (branch, revision_history), and the branch will
1091
# Invoked after a branch is opened. The api signature is (branch).
1093
# invoked after a push operation completes.
1094
# the api signature is
1096
# containing the members
1097
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1098
# where local is the local target branch or None, master is the target
1099
# master branch, and the rest should be self explanatory. The source
1100
# is read locked and the target branches write locked. Source will
1101
# be the local low-latency branch.
1102
self['post_push'] = []
1103
# invoked after a pull operation completes.
1104
# the api signature is
1106
# containing the members
1107
# (source, local, master, old_revno, old_revid, new_revno, new_revid)
1108
# where local is the local branch or None, master is the target
1109
# master branch, and the rest should be self explanatory. The source
1110
# is read locked and the target branches write locked. The local
1111
# branch is the low-latency branch.
1112
self['post_pull'] = []
1113
# invoked before a commit operation takes place.
1114
# the api signature is
1115
# (local, master, old_revno, old_revid, future_revno, future_revid,
1116
# tree_delta, future_tree).
1117
# old_revid is NULL_REVISION for the first commit to a branch
1118
# tree_delta is a TreeDelta object describing changes from the basis
1119
# revision, hooks MUST NOT modify this delta
1120
# future_tree is an in-memory tree obtained from
1121
# CommitBuilder.revision_tree() and hooks MUST NOT modify this tree
1122
self['pre_commit'] = []
1123
# invoked after a commit operation completes.
1124
# the api signature is
1125
# (local, master, old_revno, old_revid, new_revno, new_revid)
1126
# old_revid is NULL_REVISION for the first commit to a branch.
1127
self['post_commit'] = []
1128
# invoked after a uncommit operation completes.
1129
# the api signature is
1130
# (local, master, old_revno, old_revid, new_revno, new_revid) where
1131
# local is the local branch or None, master is the target branch,
1132
# and an empty branch recieves new_revno of 0, new_revid of None.
1133
self['post_uncommit'] = []
1135
# Invoked before the tip of a branch changes.
1136
# the api signature is
1137
# (params) where params is a ChangeBranchTipParams with the members
1138
# (branch, old_revno, new_revno, old_revid, new_revid)
1139
self['pre_change_branch_tip'] = []
1141
# Invoked after the tip of a branch changes.
1142
# the api signature is
1143
# (params) where params is a ChangeBranchTipParams with the members
1144
# (branch, old_revno, new_revno, old_revid, new_revid)
1145
self['post_change_branch_tip'] = []
1147
# Invoked when a stacked branch activates its fallback locations and
1148
# allows the transformation of the url of said location.
1149
# the api signature is
1150
# (branch, url) where branch is the branch having its fallback
1151
# location activated and url is the url for the fallback location.
1152
# The hook should return a url.
1153
self['transform_fallback_location'] = []
1156
# install the default hooks into the Branch class.
1157
Branch.hooks = BranchHooks()
1160
class ChangeBranchTipParams(object):
1161
"""Object holding parameters passed to *_change_branch_tip hooks.
1163
There are 5 fields that hooks may wish to access:
1165
:ivar branch: the branch being changed
1166
:ivar old_revno: revision number before the change
1167
:ivar new_revno: revision number after the change
1168
:ivar old_revid: revision id before the change
1169
:ivar new_revid: revision id after the change
1171
The revid fields are strings. The revno fields are integers.
1174
def __init__(self, branch, old_revno, new_revno, old_revid, new_revid):
1175
"""Create a group of ChangeBranchTip parameters.
1177
:param branch: The branch being changed.
1178
:param old_revno: Revision number before the change.
1179
:param new_revno: Revision number after the change.
1180
:param old_revid: Tip revision id before the change.
1181
:param new_revid: Tip revision id after the change.
1183
self.branch = branch
1184
self.old_revno = old_revno
1185
self.new_revno = new_revno
1186
self.old_revid = old_revid
1187
self.new_revid = new_revid
1189
def __eq__(self, other):
1190
return self.__dict__ == other.__dict__
1193
return "<%s of %s from (%s, %s) to (%s, %s)>" % (
1194
self.__class__.__name__, self.branch,
1195
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
719
1198
class BzrBranchFormat4(BranchFormat):
720
1199
"""Bzr branch format 4.
792
1302
def initialize(self, a_bzrdir):
793
1303
"""Create a branch of this format in a_bzrdir."""
794
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
795
branch_transport = a_bzrdir.get_branch_transport(self)
796
1304
utf8_files = [('revision-history', ''),
797
1305
('branch-name', ''),
799
control_files = lockable_files.LockableFiles(branch_transport, 'lock',
801
control_files.create_lock()
802
control_files.lock_write()
803
control_files.put_utf8('format', self.get_format_string())
805
for file, content in utf8_files:
806
control_files.put_utf8(file, content)
808
control_files.unlock()
809
return self.open(a_bzrdir, _found=True, )
1307
return self._initialize_helper(a_bzrdir, utf8_files)
1309
def supports_tags(self):
1313
class BzrBranchFormat6(BranchFormatMetadir):
1314
"""Branch format with last-revision and tags.
1316
Unlike previous formats, this has no explicit revision history. Instead,
1317
this just stores the last-revision, and the left-hand history leading
1318
up to there is the history.
1320
This format was introduced in bzr 0.15
1321
and became the default in 0.91.
1324
def _branch_class(self):
1327
def get_format_string(self):
1328
"""See BranchFormat.get_format_string()."""
1329
return "Bazaar Branch Format 6 (bzr 0.15)\n"
1331
def get_format_description(self):
1332
"""See BranchFormat.get_format_description()."""
1333
return "Branch format 6"
1335
def initialize(self, a_bzrdir):
1336
"""Create a branch of this format in a_bzrdir."""
1337
utf8_files = [('last-revision', '0 null:\n'),
1338
('branch.conf', ''),
1341
return self._initialize_helper(a_bzrdir, utf8_files)
1344
class BzrBranchFormat7(BranchFormatMetadir):
1345
"""Branch format with last-revision, tags, and a stacked location pointer.
1347
The stacked location pointer is passed down to the repository and requires
1348
a repository format with supports_external_lookups = True.
1350
This format was introduced in bzr 1.6.
1353
def _branch_class(self):
1356
def get_format_string(self):
1357
"""See BranchFormat.get_format_string()."""
1358
return "Bazaar Branch Format 7 (needs bzr 1.6)\n"
1360
def get_format_description(self):
1361
"""See BranchFormat.get_format_description()."""
1362
return "Branch format 7"
1364
def initialize(self, a_bzrdir):
1365
"""Create a branch of this format in a_bzrdir."""
1366
utf8_files = [('last-revision', '0 null:\n'),
1367
('branch.conf', ''),
1370
return self._initialize_helper(a_bzrdir, utf8_files)
811
1372
def __init__(self):
812
super(BzrBranchFormat5, self).__init__()
813
self._matchingbzrdir = bzrdir.BzrDirMetaFormat1()
815
def open(self, a_bzrdir, _found=False):
816
"""Return the branch object for a_bzrdir
818
_found is a private parameter, do not use it. It is used to indicate
819
if format probing has already be done.
822
format = BranchFormat.find_format(a_bzrdir)
823
assert format.__class__ == self.__class__
824
transport = a_bzrdir.get_branch_transport(None)
825
control_files = lockable_files.LockableFiles(transport, 'lock',
827
return BzrBranch5(_format=self,
828
_control_files=control_files,
830
_repository=a_bzrdir.find_repository())
833
return "Bazaar-NG Metadir branch format 5"
1373
super(BzrBranchFormat7, self).__init__()
1374
self._matchingbzrdir.repository_format = \
1375
RepositoryFormatKnitPack5RichRoot()
1377
def supports_stacking(self):
836
1381
class BranchReferenceFormat(BranchFormat):
1073
1567
"""See Branch.print_file."""
1074
1568
return self.repository.print_file(file, revision_id)
1077
def append_revision(self, *revision_ids):
1078
"""See Branch.append_revision."""
1079
for revision_id in revision_ids:
1080
_mod_revision.check_not_reserved_id(revision_id)
1081
mutter("add {%s} to revision-history" % revision_id)
1082
rev_history = self.revision_history()
1083
rev_history.extend(revision_ids)
1084
self.set_revision_history(rev_history)
1570
def _write_revision_history(self, history):
1571
"""Factored out of set_revision_history.
1573
This performs the actual writing to disk.
1574
It is intended to be called by BzrBranch5.set_revision_history."""
1575
self._transport.put_bytes(
1576
'revision-history', '\n'.join(history),
1577
mode=self.bzrdir._get_file_mode())
1086
1579
@needs_write_lock
1087
1580
def set_revision_history(self, rev_history):
1088
1581
"""See Branch.set_revision_history."""
1089
self.control_files.put_utf8(
1090
'revision-history', '\n'.join(rev_history))
1091
transaction = self.get_transaction()
1092
history = transaction.map.find_revision_history()
1093
if history is not None:
1094
# update the revision history in the identity map.
1095
history[:] = list(rev_history)
1096
# this call is disabled because revision_history is
1097
# not really an object yet, and the transaction is for objects.
1098
# transaction.register_dirty(history)
1100
transaction.map.add_revision_history(rev_history)
1101
# this call is disabled because revision_history is
1102
# not really an object yet, and the transaction is for objects.
1103
# transaction.register_clean(history)
1106
def revision_history(self):
1107
"""See Branch.revision_history."""
1108
transaction = self.get_transaction()
1109
history = transaction.map.find_revision_history()
1110
if history is not None:
1111
# mutter("cache hit for revision-history in %s", self)
1112
return list(history)
1113
decode_utf8 = cache_utf8.decode
1114
history = [decode_utf8(l.rstrip('\r\n')) for l in
1115
self.control_files.get('revision-history').readlines()]
1116
transaction.map.add_revision_history(history)
1117
# this call is disabled because revision_history is
1118
# not really an object yet, and the transaction is for objects.
1119
# transaction.register_clean(history, precious=True)
1120
return list(history)
1123
def generate_revision_history(self, revision_id, last_rev=None,
1582
if 'evil' in debug.debug_flags:
1583
mutter_callsite(3, "set_revision_history scales with history.")
1584
check_not_reserved_id = _mod_revision.check_not_reserved_id
1585
for rev_id in rev_history:
1586
check_not_reserved_id(rev_id)
1587
if Branch.hooks['post_change_branch_tip']:
1588
# Don't calculate the last_revision_info() if there are no hooks
1590
old_revno, old_revid = self.last_revision_info()
1591
if len(rev_history) == 0:
1592
revid = _mod_revision.NULL_REVISION
1594
revid = rev_history[-1]
1595
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
1596
self._write_revision_history(rev_history)
1597
self._clear_cached_state()
1598
self._cache_revision_history(rev_history)
1599
for hook in Branch.hooks['set_rh']:
1600
hook(self, rev_history)
1601
if Branch.hooks['post_change_branch_tip']:
1602
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
1604
def _synchronize_history(self, destination, revision_id):
1605
"""Synchronize last revision and revision history between branches.
1607
This version is most efficient when the destination is also a
1608
BzrBranch5, but works for BzrBranch6 as long as the revision
1609
history is the true lefthand parent history, and all of the revisions
1610
are in the destination's repository. If not, set_revision_history
1613
:param destination: The branch to copy the history into
1614
:param revision_id: The revision-id to truncate history at. May
1615
be None to copy complete history.
1617
if not isinstance(destination._format, BzrBranchFormat5):
1618
super(BzrBranch, self)._synchronize_history(
1619
destination, revision_id)
1621
if revision_id == _mod_revision.NULL_REVISION:
1624
new_history = self.revision_history()
1625
if revision_id is not None and new_history != []:
1627
new_history = new_history[:new_history.index(revision_id) + 1]
1629
rev = self.repository.get_revision(revision_id)
1630
new_history = rev.get_history(self.repository)[1:]
1631
destination.set_revision_history(new_history)
1633
def _run_pre_change_branch_tip_hooks(self, new_revno, new_revid):
1634
"""Run the pre_change_branch_tip hooks."""
1635
hooks = Branch.hooks['pre_change_branch_tip']
1638
old_revno, old_revid = self.last_revision_info()
1639
params = ChangeBranchTipParams(
1640
self, old_revno, new_revno, old_revid, new_revid)
1644
except errors.TipChangeRejected:
1647
exc_info = sys.exc_info()
1648
hook_name = Branch.hooks.get_hook_name(hook)
1649
raise errors.HookFailed(
1650
'pre_change_branch_tip', hook_name, exc_info)
1652
def _run_post_change_branch_tip_hooks(self, old_revno, old_revid):
1653
"""Run the post_change_branch_tip hooks."""
1654
hooks = Branch.hooks['post_change_branch_tip']
1657
new_revno, new_revid = self.last_revision_info()
1658
params = ChangeBranchTipParams(
1659
self, old_revno, new_revno, old_revid, new_revid)
1664
def set_last_revision_info(self, revno, revision_id):
1665
"""Set the last revision of this branch.
1667
The caller is responsible for checking that the revno is correct
1668
for this revision id.
1670
It may be possible to set the branch last revision to an id not
1671
present in the repository. However, branches can also be
1672
configured to check constraints on history, in which case this may not
1675
revision_id = _mod_revision.ensure_null(revision_id)
1676
# this old format stores the full history, but this api doesn't
1677
# provide it, so we must generate, and might as well check it's
1679
history = self._lefthand_history(revision_id)
1680
if len(history) != revno:
1681
raise AssertionError('%d != %d' % (len(history), revno))
1682
self.set_revision_history(history)
1684
def _gen_revision_history(self):
1685
history = self._transport.get_bytes('revision-history').split('\n')
1686
if history[-1:] == ['']:
1687
# There shouldn't be a trailing newline, but just in case.
1691
def _lefthand_history(self, revision_id, last_rev=None,
1693
if 'evil' in debug.debug_flags:
1694
mutter_callsite(4, "_lefthand_history scales with history.")
1695
# stop_revision must be a descendant of last_revision
1696
graph = self.repository.get_graph()
1697
if last_rev is not None:
1698
if not graph.is_ancestor(last_rev, revision_id):
1699
# our previous tip is not merged into stop_revision
1700
raise errors.DivergedBranches(self, other_branch)
1701
# make a new revision history from the graph
1702
parents_map = graph.get_parent_map([revision_id])
1703
if revision_id not in parents_map:
1704
raise errors.NoSuchRevision(self, revision_id)
1705
current_rev_id = revision_id
1707
check_not_reserved_id = _mod_revision.check_not_reserved_id
1708
# Do not include ghosts or graph origin in revision_history
1709
while (current_rev_id in parents_map and
1710
len(parents_map[current_rev_id]) > 0):
1711
check_not_reserved_id(current_rev_id)
1712
new_history.append(current_rev_id)
1713
current_rev_id = parents_map[current_rev_id][0]
1714
parents_map = graph.get_parent_map([current_rev_id])
1715
new_history.reverse()
1719
def generate_revision_history(self, revision_id, last_rev=None,
1124
1720
other_branch=None):
1125
1721
"""Create a new revision history that will finish with revision_id.
1127
1723
:param revision_id: the new tip to use.
1128
1724
:param last_rev: The previous last_revision. If not None, then this
1129
1725
must be a ancestory of revision_id, or DivergedBranches is raised.
1130
1726
:param other_branch: The other branch that DivergedBranches should
1131
1727
raise with respect to.
1133
# stop_revision must be a descendant of last_revision
1134
stop_graph = self.repository.get_revision_graph(revision_id)
1135
if last_rev is not None and last_rev not in stop_graph:
1136
# our previous tip is not merged into stop_revision
1137
raise errors.DivergedBranches(self, other_branch)
1138
# make a new revision history from the graph
1139
current_rev_id = revision_id
1141
while current_rev_id not in (None, _mod_revision.NULL_REVISION):
1142
new_history.append(current_rev_id)
1143
current_rev_id_parents = stop_graph[current_rev_id]
1145
current_rev_id = current_rev_id_parents[0]
1147
current_rev_id = None
1148
new_history.reverse()
1149
self.set_revision_history(new_history)
1152
def update_revisions(self, other, stop_revision=None):
1153
"""See Branch.update_revisions."""
1156
if stop_revision is None:
1157
stop_revision = other.last_revision()
1158
if stop_revision is None:
1159
# if there are no commits, we're done.
1161
# whats the current last revision, before we fetch [and change it
1163
last_rev = self.last_revision()
1164
# we fetch here regardless of whether we need to so that we pickup
1166
self.fetch(other, stop_revision)
1167
my_ancestry = self.repository.get_ancestry(last_rev)
1168
if stop_revision in my_ancestry:
1169
# last_revision is a descendant of stop_revision
1171
self.generate_revision_history(stop_revision, last_rev=last_rev,
1729
self.set_revision_history(self._lefthand_history(revision_id,
1730
last_rev, other_branch))
1176
1732
def basis_tree(self):
1177
1733
"""See Branch.basis_tree."""
1178
1734
return self.repository.revision_tree(self.last_revision())
1180
@deprecated_method(zero_eight)
1181
def working_tree(self):
1182
"""Create a Working tree object for this branch."""
1184
from bzrlib.transport.local import LocalTransport
1185
if (self.base.find('://') != -1 or
1186
not isinstance(self._transport, LocalTransport)):
1187
raise NoWorkingTree(self.base)
1188
return self.bzrdir.open_workingtree()
1190
1736
@needs_write_lock
1191
def pull(self, source, overwrite=False, stop_revision=None):
1192
"""See Branch.pull."""
1737
def pull(self, source, overwrite=False, stop_revision=None,
1738
_hook_master=None, run_hooks=True, possible_transports=None,
1739
_override_hook_target=None):
1742
:param _hook_master: Private parameter - set the branch to
1743
be supplied as the master to pull hooks.
1744
:param run_hooks: Private parameter - if false, this branch
1745
is being called because it's the master of the primary branch,
1746
so it should not run its hooks.
1747
:param _override_hook_target: Private parameter - set the branch to be
1748
supplied as the target_branch to pull hooks.
1750
result = PullResult()
1751
result.source_branch = source
1752
if _override_hook_target is None:
1753
result.target_branch = self
1755
result.target_branch = _override_hook_target
1193
1756
source.lock_read()
1195
old_count = len(self.revision_history())
1197
self.update_revisions(source, stop_revision)
1198
except DivergedBranches:
1202
self.set_revision_history(source.revision_history())
1203
new_count = len(self.revision_history())
1204
return new_count - old_count
1758
# We assume that during 'pull' the local repository is closer than
1760
graph = self.repository.get_graph(source.repository)
1761
result.old_revno, result.old_revid = self.last_revision_info()
1762
self.update_revisions(source, stop_revision, overwrite=overwrite,
1764
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
1765
result.new_revno, result.new_revid = self.last_revision_info()
1767
result.master_branch = _hook_master
1768
result.local_branch = result.target_branch
1770
result.master_branch = result.target_branch
1771
result.local_branch = None
1773
for hook in Branch.hooks['post_pull']:
1206
1776
source.unlock()
1208
def get_parent(self):
1209
"""See Branch.get_parent."""
1779
def _get_parent_location(self):
1211
1780
_locs = ['parent', 'pull', 'x-pull']
1212
assert self.base[-1] == '/'
1213
1781
for l in _locs:
1215
parent = self.control_files.get(l).read().strip('\n')
1218
# This is an old-format absolute path to a local branch
1219
# turn it into a url
1220
if parent.startswith('/'):
1221
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1223
return urlutils.join(self.base[:-1], parent)
1224
except errors.InvalidURLJoin, e:
1225
raise errors.InaccessibleParent(parent, self.base)
1783
return self._transport.get_bytes(l).strip('\n')
1784
except errors.NoSuchFile:
1228
def get_push_location(self):
1229
"""See Branch.get_push_location."""
1230
push_loc = self.get_config().get_user_option('push_location')
1789
def push(self, target, overwrite=False, stop_revision=None,
1790
_override_hook_source_branch=None):
1793
This is the basic concrete implementation of push()
1795
:param _override_hook_source_branch: If specified, run
1796
the hooks passing this Branch as the source, rather than self.
1797
This is for use of RemoteBranch, where push is delegated to the
1798
underlying vfs-based Branch.
1800
# TODO: Public option to disable running hooks - should be trivial but
1802
return _run_with_write_locked_target(
1803
target, self._push_with_bound_branches, target, overwrite,
1805
_override_hook_source_branch=_override_hook_source_branch)
1807
def _push_with_bound_branches(self, target, overwrite,
1809
_override_hook_source_branch=None):
1810
"""Push from self into target, and into target's master if any.
1812
This is on the base BzrBranch class even though it doesn't support
1813
bound branches because the *target* might be bound.
1816
if _override_hook_source_branch:
1817
result.source_branch = _override_hook_source_branch
1818
for hook in Branch.hooks['post_push']:
1821
bound_location = target.get_bound_location()
1822
if bound_location and target.base != bound_location:
1823
# there is a master branch.
1825
# XXX: Why the second check? Is it even supported for a branch to
1826
# be bound to itself? -- mbp 20070507
1827
master_branch = target.get_master_branch()
1828
master_branch.lock_write()
1830
# push into the master from this branch.
1831
self._basic_push(master_branch, overwrite, stop_revision)
1832
# and push into the target branch from this. Note that we push from
1833
# this branch again, because its considered the highest bandwidth
1835
result = self._basic_push(target, overwrite, stop_revision)
1836
result.master_branch = master_branch
1837
result.local_branch = target
1841
master_branch.unlock()
1844
result = self._basic_push(target, overwrite, stop_revision)
1845
# TODO: Why set master_branch and local_branch if there's no
1846
# binding? Maybe cleaner to just leave them unset? -- mbp
1848
result.master_branch = target
1849
result.local_branch = None
1853
def _basic_push(self, target, overwrite, stop_revision):
1854
"""Basic implementation of push without bound branches or hooks.
1856
Must be called with self read locked and target write locked.
1858
result = PushResult()
1859
result.source_branch = self
1860
result.target_branch = target
1861
result.old_revno, result.old_revid = target.last_revision_info()
1862
if result.old_revid != self.last_revision():
1863
# We assume that during 'push' this repository is closer than
1865
graph = self.repository.get_graph(target.repository)
1866
target.update_revisions(self, stop_revision, overwrite=overwrite,
1868
if self._push_should_merge_tags():
1869
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
1870
result.new_revno, result.new_revid = target.last_revision_info()
1873
def _push_should_merge_tags(self):
1874
"""Should _basic_push merge this branch's tags into the target?
1876
The default implementation returns False if this branch has no tags,
1877
and True the rest of the time. Subclasses may override this.
1879
return self.tags.supports_tags() and self.tags.get_tag_dict()
1881
def get_parent(self):
1882
"""See Branch.get_parent."""
1883
parent = self._get_parent_location()
1886
# This is an old-format absolute path to a local branch
1887
# turn it into a url
1888
if parent.startswith('/'):
1889
parent = urlutils.local_path_to_url(parent.decode('utf8'))
1891
return urlutils.join(self.base[:-1], parent)
1892
except errors.InvalidURLJoin, e:
1893
raise errors.InaccessibleParent(parent, self.base)
1895
def get_stacked_on_url(self):
1896
raise errors.UnstackableBranchFormat(self._format, self.base)
1233
1898
def set_push_location(self, location):
1234
1899
"""See Branch.set_push_location."""
1242
1907
# TODO: Maybe delete old location files?
1243
1908
# URLs should never be unicode, even on the local fs,
1244
1909
# FIXUP this and get_parent in a future branch format bump:
1245
# read and rewrite the file, and have the new format code read
1246
# using .get not .get_utf8. RBC 20060125
1248
self.control_files._transport.delete('parent')
1910
# read and rewrite the file. RBC 20060125
1250
1912
if isinstance(url, unicode):
1252
1914
url = url.encode('ascii')
1253
1915
except UnicodeEncodeError:
1254
raise bzrlib.errors.InvalidURL(url,
1916
raise errors.InvalidURL(url,
1255
1917
"Urls must be 7-bit ascii, "
1256
1918
"use bzrlib.urlutils.escape")
1258
1919
url = urlutils.relative_url(self.base, url)
1259
self.control_files.put('parent', StringIO(url + '\n'))
1261
@deprecated_function(zero_nine)
1262
def tree_config(self):
1263
"""DEPRECATED; call get_config instead.
1264
TreeConfig has become part of BranchConfig."""
1265
return TreeConfig(self)
1920
self._set_parent_location(url)
1922
def _set_parent_location(self, url):
1924
self._transport.delete('parent')
1926
self._transport.put_bytes('parent', url + '\n',
1927
mode=self.bzrdir._get_file_mode())
1929
def set_stacked_on_url(self, url):
1930
raise errors.UnstackableBranchFormat(self._format, self.base)
1268
1933
class BzrBranch5(BzrBranch):
1269
"""A format 5 branch. This supports new features over plan branches.
1934
"""A format 5 branch. This supports new features over plain branches.
1271
1936
It has support for a master_branch which is the data for bound branches.
1279
super(BzrBranch5, self).__init__(_format=_format,
1280
_control_files=_control_files,
1282
_repository=_repository)
1940
def pull(self, source, overwrite=False, stop_revision=None,
1941
run_hooks=True, possible_transports=None,
1942
_override_hook_target=None):
1943
"""Pull from source into self, updating my master if any.
1285
def pull(self, source, overwrite=False, stop_revision=None):
1286
"""Updates branch.pull to be bound branch aware."""
1945
:param run_hooks: Private parameter - if false, this branch
1946
is being called because it's the master of the primary branch,
1947
so it should not run its hooks.
1287
1949
bound_location = self.get_bound_location()
1288
if source.base != bound_location:
1950
master_branch = None
1951
if bound_location and source.base != bound_location:
1289
1952
# not pulling from master, so we need to update master.
1290
master_branch = self.get_master_branch()
1292
master_branch.pull(source)
1293
source = master_branch
1294
return super(BzrBranch5, self).pull(source, overwrite, stop_revision)
1953
master_branch = self.get_master_branch(possible_transports)
1954
master_branch.lock_write()
1957
# pull from source into master.
1958
master_branch.pull(source, overwrite, stop_revision,
1960
return super(BzrBranch5, self).pull(source, overwrite,
1961
stop_revision, _hook_master=master_branch,
1962
run_hooks=run_hooks,
1963
_override_hook_target=_override_hook_target)
1966
master_branch.unlock()
1296
1968
def get_bound_location(self):
1298
return self.control_files.get_utf8('bound').read()[:-1]
1970
return self._transport.get_bytes('bound')[:-1]
1299
1971
except errors.NoSuchFile:
1302
1974
@needs_read_lock
1303
def get_master_branch(self):
1975
def get_master_branch(self, possible_transports=None):
1304
1976
"""Return the branch we are bound to.
1306
1978
:return: Either a Branch, or None
1382
2040
return self.set_bound_location(None)
1384
2042
@needs_write_lock
2043
def update(self, possible_transports=None):
1386
2044
"""Synchronise this branch with the master branch if any.
1388
2046
:return: None or the last_revision that was pivoted out during the
1391
master = self.get_master_branch()
2049
master = self.get_master_branch(possible_transports)
1392
2050
if master is not None:
1393
old_tip = self.last_revision()
2051
old_tip = _mod_revision.ensure_null(self.last_revision())
1394
2052
self.pull(master, overwrite=True)
1395
if old_tip in self.repository.get_ancestry(self.last_revision()):
2053
if self.repository.get_graph().is_ancestor(old_tip,
2054
_mod_revision.ensure_null(self.last_revision())):
1401
class BranchTestProviderAdapter(object):
1402
"""A tool to generate a suite testing multiple branch formats at once.
1404
This is done by copying the test once for each transport and injecting
1405
the transport_server, transport_readonly_server, and branch_format
1406
classes into each copy. Each copy is also given a new id() to make it
1410
def __init__(self, transport_server, transport_readonly_server, formats):
1411
self._transport_server = transport_server
1412
self._transport_readonly_server = transport_readonly_server
1413
self._formats = formats
1415
def adapt(self, test):
1416
result = TestSuite()
1417
for branch_format, bzrdir_format in self._formats:
1418
new_test = deepcopy(test)
1419
new_test.transport_server = self._transport_server
1420
new_test.transport_readonly_server = self._transport_readonly_server
1421
new_test.bzrdir_format = bzrdir_format
1422
new_test.branch_format = branch_format
1423
def make_new_test_id():
1424
new_id = "%s(%s)" % (new_test.id(), branch_format.__class__.__name__)
1425
return lambda: new_id
1426
new_test.id = make_new_test_id()
1427
result.addTest(new_test)
2060
class BzrBranch7(BzrBranch5):
2061
"""A branch with support for a fallback repository."""
2063
def _get_fallback_repository(self, url):
2064
"""Get the repository we fallback to at url."""
2065
url = urlutils.join(self.base, url)
2066
a_bzrdir = bzrdir.BzrDir.open(url,
2067
possible_transports=[self._transport])
2068
return a_bzrdir.open_branch().repository
2070
def _activate_fallback_location(self, url):
2071
"""Activate the branch/repository from url as a fallback repository."""
2072
self.repository.add_fallback_repository(
2073
self._get_fallback_repository(url))
2075
def _open_hook(self):
2077
url = self.get_stacked_on_url()
2078
except (errors.UnstackableRepositoryFormat, errors.NotStacked,
2079
errors.UnstackableBranchFormat):
2082
for hook in Branch.hooks['transform_fallback_location']:
2083
url = hook(self, url)
2085
hook_name = Branch.hooks.get_hook_name(hook)
2086
raise AssertionError(
2087
"'transform_fallback_location' hook %s returned "
2088
"None, not a URL." % hook_name)
2089
self._activate_fallback_location(url)
2091
def _check_stackable_repo(self):
2092
if not self.repository._format.supports_external_lookups:
2093
raise errors.UnstackableRepositoryFormat(self.repository._format,
2094
self.repository.base)
2096
def __init__(self, *args, **kwargs):
2097
super(BzrBranch7, self).__init__(*args, **kwargs)
2098
self._last_revision_info_cache = None
2099
self._partial_revision_history_cache = []
2101
def _clear_cached_state(self):
2102
super(BzrBranch7, self)._clear_cached_state()
2103
self._last_revision_info_cache = None
2104
self._partial_revision_history_cache = []
2106
def _last_revision_info(self):
2107
revision_string = self._transport.get_bytes('last-revision')
2108
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2109
revision_id = cache_utf8.get_cached_utf8(revision_id)
2111
return revno, revision_id
2113
def _write_last_revision_info(self, revno, revision_id):
2114
"""Simply write out the revision id, with no checks.
2116
Use set_last_revision_info to perform this safely.
2118
Does not update the revision_history cache.
2119
Intended to be called by set_last_revision_info and
2120
_write_revision_history.
2122
revision_id = _mod_revision.ensure_null(revision_id)
2123
out_string = '%d %s\n' % (revno, revision_id)
2124
self._transport.put_bytes('last-revision', out_string,
2125
mode=self.bzrdir._get_file_mode())
2128
def set_last_revision_info(self, revno, revision_id):
2129
revision_id = _mod_revision.ensure_null(revision_id)
2130
old_revno, old_revid = self.last_revision_info()
2131
if self._get_append_revisions_only():
2132
self._check_history_violation(revision_id)
2133
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2134
self._write_last_revision_info(revno, revision_id)
2135
self._clear_cached_state()
2136
self._last_revision_info_cache = revno, revision_id
2137
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2139
def _synchronize_history(self, destination, revision_id):
2140
"""Synchronize last revision and revision history between branches.
2142
:see: Branch._synchronize_history
2144
# XXX: The base Branch has a fast implementation of this method based
2145
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2146
# that uses set_revision_history. This class inherits from BzrBranch5,
2147
# but wants the fast implementation, so it calls
2148
# Branch._synchronize_history directly.
2149
Branch._synchronize_history(self, destination, revision_id)
2151
def _check_history_violation(self, revision_id):
2152
last_revision = _mod_revision.ensure_null(self.last_revision())
2153
if _mod_revision.is_null(last_revision):
2155
if last_revision not in self._lefthand_history(revision_id):
2156
raise errors.AppendRevisionsOnlyViolation(self.base)
2158
def _gen_revision_history(self):
2159
"""Generate the revision history from last revision
2161
last_revno, last_revision = self.last_revision_info()
2162
self._extend_partial_history(stop_index=last_revno-1)
2163
return list(reversed(self._partial_revision_history_cache))
2165
def _extend_partial_history(self, stop_index=None, stop_revision=None):
2166
"""Extend the partial history to include a given index
2168
If a stop_index is supplied, stop when that index has been reached.
2169
If a stop_revision is supplied, stop when that revision is
2170
encountered. Otherwise, stop when the beginning of history is
2173
:param stop_index: The index which should be present. When it is
2174
present, history extension will stop.
2175
:param revision_id: The revision id which should be present. When
2176
it is encountered, history extension will stop.
2178
repo = self.repository
2179
if len(self._partial_revision_history_cache) == 0:
2180
iterator = repo.iter_reverse_revision_history(self.last_revision())
2182
start_revision = self._partial_revision_history_cache[-1]
2183
iterator = repo.iter_reverse_revision_history(start_revision)
2184
#skip the last revision in the list
2185
next_revision = iterator.next()
2186
for revision_id in iterator:
2187
self._partial_revision_history_cache.append(revision_id)
2188
if (stop_index is not None and
2189
len(self._partial_revision_history_cache) > stop_index):
2191
if revision_id == stop_revision:
2194
def _write_revision_history(self, history):
2195
"""Factored out of set_revision_history.
2197
This performs the actual writing to disk, with format-specific checks.
2198
It is intended to be called by BzrBranch5.set_revision_history.
2200
if len(history) == 0:
2201
last_revision = 'null:'
2203
if history != self._lefthand_history(history[-1]):
2204
raise errors.NotLefthandHistory(history)
2205
last_revision = history[-1]
2206
if self._get_append_revisions_only():
2207
self._check_history_violation(last_revision)
2208
self._write_last_revision_info(len(history), last_revision)
2211
def _set_parent_location(self, url):
2212
"""Set the parent branch"""
2213
self._set_config_location('parent_location', url, make_relative=True)
2216
def _get_parent_location(self):
2217
"""Set the parent branch"""
2218
return self._get_config_location('parent_location')
2220
def set_push_location(self, location):
2221
"""See Branch.set_push_location."""
2222
self._set_config_location('push_location', location)
2224
def set_bound_location(self, location):
2225
"""See Branch.set_push_location."""
2227
config = self.get_config()
2228
if location is None:
2229
if config.get_user_option('bound') != 'True':
2232
config.set_user_option('bound', 'False', warn_masked=True)
2235
self._set_config_location('bound_location', location,
2237
config.set_user_option('bound', 'True', warn_masked=True)
2240
def _get_bound_location(self, bound):
2241
"""Return the bound location in the config file.
2243
Return None if the bound parameter does not match"""
2244
config = self.get_config()
2245
config_bound = (config.get_user_option('bound') == 'True')
2246
if config_bound != bound:
2248
return self._get_config_location('bound_location', config=config)
2250
def get_bound_location(self):
2251
"""See Branch.set_push_location."""
2252
return self._get_bound_location(True)
2254
def get_old_bound_location(self):
2255
"""See Branch.get_old_bound_location"""
2256
return self._get_bound_location(False)
2258
def get_stacked_on_url(self):
2259
# you can always ask for the URL; but you might not be able to use it
2260
# if the repo can't support stacking.
2261
## self._check_stackable_repo()
2262
stacked_url = self._get_config_location('stacked_on_location')
2263
if stacked_url is None:
2264
raise errors.NotStacked(self)
2267
def set_append_revisions_only(self, enabled):
2272
self.get_config().set_user_option('append_revisions_only', value,
2275
def set_stacked_on_url(self, url):
2276
self._check_stackable_repo()
2279
old_url = self.get_stacked_on_url()
2280
except (errors.NotStacked, errors.UnstackableBranchFormat,
2281
errors.UnstackableRepositoryFormat):
2284
# repositories don't offer an interface to remove fallback
2285
# repositories today; take the conceptually simpler option and just
2287
self.repository = self.bzrdir.find_repository()
2288
# for every revision reference the branch has, ensure it is pulled
2290
source_repository = self._get_fallback_repository(old_url)
2291
for revision_id in chain([self.last_revision()],
2292
self.tags.get_reverse_tag_dict()):
2293
self.repository.fetch(source_repository, revision_id,
2296
self._activate_fallback_location(url)
2297
# write this out after the repository is stacked to avoid setting a
2298
# stacked config that doesn't work.
2299
self._set_config_location('stacked_on_location', url)
2301
def _get_append_revisions_only(self):
2302
value = self.get_config().get_user_option('append_revisions_only')
2303
return value == 'True'
2305
def _make_tags(self):
2306
return BasicTags(self)
2309
def generate_revision_history(self, revision_id, last_rev=None,
2311
"""See BzrBranch5.generate_revision_history"""
2312
history = self._lefthand_history(revision_id, last_rev, other_branch)
2313
revno = len(history)
2314
self.set_last_revision_info(revno, revision_id)
2317
def get_rev_id(self, revno, history=None):
2318
"""Find the revision id of the specified revno."""
2320
return _mod_revision.NULL_REVISION
2322
last_revno, last_revision_id = self.last_revision_info()
2323
if revno <= 0 or revno > last_revno:
2324
raise errors.NoSuchRevision(self, revno)
2326
if history is not None:
2327
return history[revno - 1]
2329
index = last_revno - revno
2330
if len(self._partial_revision_history_cache) <= index:
2331
self._extend_partial_history(stop_index=index)
2332
if len(self._partial_revision_history_cache) > index:
2333
return self._partial_revision_history_cache[index]
2335
raise errors.NoSuchRevision(self, revno)
2338
def revision_id_to_revno(self, revision_id):
2339
"""Given a revision id, return its revno"""
2340
if _mod_revision.is_null(revision_id):
2343
index = self._partial_revision_history_cache.index(revision_id)
2345
self._extend_partial_history(stop_revision=revision_id)
2346
index = len(self._partial_revision_history_cache) - 1
2347
if self._partial_revision_history_cache[index] != revision_id:
2348
raise errors.NoSuchRevision(self, revision_id)
2349
return self.revno() - index
2352
class BzrBranch6(BzrBranch7):
2353
"""See BzrBranchFormat6 for the capabilities of this branch.
2355
This subclass of BzrBranch7 disables the new features BzrBranch7 added,
2359
def get_stacked_on_url(self):
2360
raise errors.UnstackableBranchFormat(self._format, self.base)
2362
def set_stacked_on_url(self, url):
2363
raise errors.UnstackableBranchFormat(self._format, self.base)
2366
######################################################################
2367
# results of operations
2370
class _Result(object):
2372
def _show_tag_conficts(self, to_file):
2373
if not getattr(self, 'tag_conflicts', None):
2375
to_file.write('Conflicting tags:\n')
2376
for name, value1, value2 in self.tag_conflicts:
2377
to_file.write(' %s\n' % (name, ))
2380
class PullResult(_Result):
2381
"""Result of a Branch.pull operation.
2383
:ivar old_revno: Revision number before pull.
2384
:ivar new_revno: Revision number after pull.
2385
:ivar old_revid: Tip revision id before pull.
2386
:ivar new_revid: Tip revision id after pull.
2387
:ivar source_branch: Source (local) branch object.
2388
:ivar master_branch: Master branch of the target, or the target if no
2390
:ivar local_branch: target branch if there is a Master, else None
2391
:ivar target_branch: Target/destination branch object.
2392
:ivar tag_conflicts: A list of tag conflicts, see BasicTags.merge_to
2396
# DEPRECATED: pull used to return the change in revno
2397
return self.new_revno - self.old_revno
2399
def report(self, to_file):
2401
if self.old_revid == self.new_revid:
2402
to_file.write('No revisions to pull.\n')
2404
to_file.write('Now on revision %d.\n' % self.new_revno)
2405
self._show_tag_conficts(to_file)
2408
class PushResult(_Result):
2409
"""Result of a Branch.push operation.
2411
:ivar old_revno: Revision number before push.
2412
:ivar new_revno: Revision number after push.
2413
:ivar old_revid: Tip revision id before push.
2414
:ivar new_revid: Tip revision id after push.
2415
:ivar source_branch: Source branch object.
2416
:ivar master_branch: Master branch of the target, or None.
2417
:ivar target_branch: Target/destination branch object.
2421
# DEPRECATED: push used to return the change in revno
2422
return self.new_revno - self.old_revno
2424
def report(self, to_file):
2425
"""Write a human-readable description of the result."""
2426
if self.old_revid == self.new_revid:
2427
to_file.write('No new revisions to push.\n')
2429
to_file.write('Pushed up to revision %d.\n' % self.new_revno)
2430
self._show_tag_conficts(to_file)
1431
2433
class BranchCheckResult(object):
added
removed
bzrlib/branch.py
