507
461
"""Iterate over an inclusive range of sorted revisions."""
508
462
rev_iter = iter(merge_sorted_revisions)
509
463
if start_revision_id is not None:
510
for node in rev_iter:
464
for rev_id, depth, revno, end_of_merge in rev_iter:
512
465
if rev_id != start_revision_id:
515
468
# The decision to include the start or not
516
469
# depends on the stop_rule if a stop is provided
517
# so pop this node back into the iterator
518
rev_iter = chain(iter([node]), rev_iter)
471
iter([(rev_id, depth, revno, end_of_merge)]),
520
474
if stop_revision_id is None:
522
for node in rev_iter:
524
yield (rev_id, node.merge_depth, node.revno,
475
for rev_id, depth, revno, end_of_merge in rev_iter:
476
yield rev_id, depth, revno, end_of_merge
526
477
elif stop_rule == 'exclude':
527
for node in rev_iter:
478
for rev_id, depth, revno, end_of_merge in rev_iter:
529
479
if rev_id == stop_revision_id:
531
yield (rev_id, node.merge_depth, node.revno,
481
yield rev_id, depth, revno, end_of_merge
533
482
elif stop_rule == 'include':
534
for node in rev_iter:
536
yield (rev_id, node.merge_depth, node.revno,
483
for rev_id, depth, revno, end_of_merge in rev_iter:
484
yield rev_id, depth, revno, end_of_merge
538
485
if rev_id == stop_revision_id:
540
elif stop_rule == 'with-merges-without-common-ancestry':
541
# We want to exclude all revisions that are already part of the
542
# stop_revision_id ancestry.
543
graph = self.repository.get_graph()
544
ancestors = graph.find_unique_ancestors(start_revision_id,
546
for node in rev_iter:
548
if rev_id not in ancestors:
550
yield (rev_id, node.merge_depth, node.revno,
552
487
elif stop_rule == 'with-merges':
553
488
stop_rev = self.repository.get_revision(stop_revision_id)
554
489
if stop_rev.parent_ids:
555
490
left_parent = stop_rev.parent_ids[0]
557
492
left_parent = _mod_revision.NULL_REVISION
558
# left_parent is the actual revision we want to stop logging at,
559
# since we want to show the merged revisions after the stop_rev too
560
reached_stop_revision_id = False
561
revision_id_whitelist = []
562
for node in rev_iter:
493
for rev_id, depth, revno, end_of_merge in rev_iter:
564
494
if rev_id == left_parent:
565
# reached the left parent after the stop_revision
567
if (not reached_stop_revision_id or
568
rev_id in revision_id_whitelist):
569
yield (rev_id, node.merge_depth, node.revno,
571
if reached_stop_revision_id or rev_id == stop_revision_id:
572
# only do the merged revs of rev_id from now on
573
rev = self.repository.get_revision(rev_id)
575
reached_stop_revision_id = True
576
revision_id_whitelist.extend(rev.parent_ids)
496
yield rev_id, depth, revno, end_of_merge
578
498
raise ValueError('invalid stop_rule %r' % stop_rule)
580
def _filter_start_non_ancestors(self, rev_iter):
581
# If we started from a dotted revno, we want to consider it as a tip
582
# and don't want to yield revisions that are not part of its
583
# ancestry. Given the order guaranteed by the merge sort, we will see
584
# uninteresting descendants of the first parent of our tip before the
586
first = rev_iter.next()
587
(rev_id, merge_depth, revno, end_of_merge) = first
590
# We start at a mainline revision so by definition, all others
591
# revisions in rev_iter are ancestors
592
for node in rev_iter:
597
pmap = self.repository.get_parent_map([rev_id])
598
parents = pmap.get(rev_id, [])
600
whitelist.update(parents)
602
# If there is no parents, there is nothing of interest left
604
# FIXME: It's hard to test this scenario here as this code is never
605
# called in that case. -- vila 20100322
608
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
610
if rev_id in whitelist:
611
pmap = self.repository.get_parent_map([rev_id])
612
parents = pmap.get(rev_id, [])
613
whitelist.remove(rev_id)
614
whitelist.update(parents)
616
# We've reached the mainline, there is nothing left to
620
# A revision that is not part of the ancestry of our
623
yield (rev_id, merge_depth, revno, end_of_merge)
625
500
def leave_lock_in_place(self):
626
501
"""Tell this branch object not to release the physical lock when this
627
502
object is unlocked.
831
669
except (errors.NotStacked, errors.UnstackableBranchFormat,
832
670
errors.UnstackableRepositoryFormat):
673
# XXX: Lock correctness - should unlock our old repo if we were
675
# repositories don't offer an interface to remove fallback
676
# repositories today; take the conceptually simpler option and just
678
self.repository = self.bzrdir.find_repository()
679
self.repository.lock_write()
680
# for every revision reference the branch has, ensure it is pulled
682
source_repository = self._get_fallback_repository(old_url)
683
for revision_id in chain([self.last_revision()],
684
self.tags.get_reverse_tag_dict()):
685
self.repository.fetch(source_repository, revision_id,
836
688
self._activate_fallback_location(url)
837
689
# write this out after the repository is stacked to avoid setting a
838
690
# stacked config that doesn't work.
839
691
self._set_config_location('stacked_on_location', url)
842
"""Change a branch to be unstacked, copying data as needed.
844
Don't call this directly, use set_stacked_on_url(None).
846
pb = ui.ui_factory.nested_progress_bar()
848
pb.update("Unstacking")
849
# The basic approach here is to fetch the tip of the branch,
850
# including all available ghosts, from the existing stacked
851
# repository into a new repository object without the fallbacks.
853
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
854
# correct for CHKMap repostiories
855
old_repository = self.repository
856
if len(old_repository._fallback_repositories) != 1:
857
raise AssertionError("can't cope with fallback repositories "
858
"of %r (fallbacks: %r)" % (old_repository,
859
old_repository._fallback_repositories))
860
# Open the new repository object.
861
# Repositories don't offer an interface to remove fallback
862
# repositories today; take the conceptually simpler option and just
863
# reopen it. We reopen it starting from the URL so that we
864
# get a separate connection for RemoteRepositories and can
865
# stream from one of them to the other. This does mean doing
866
# separate SSH connection setup, but unstacking is not a
867
# common operation so it's tolerable.
868
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
869
new_repository = new_bzrdir.find_repository()
870
if new_repository._fallback_repositories:
871
raise AssertionError("didn't expect %r to have "
872
"fallback_repositories"
873
% (self.repository,))
874
# Replace self.repository with the new repository.
875
# Do our best to transfer the lock state (i.e. lock-tokens and
876
# lock count) of self.repository to the new repository.
877
lock_token = old_repository.lock_write().repository_token
878
self.repository = new_repository
879
if isinstance(self, remote.RemoteBranch):
880
# Remote branches can have a second reference to the old
881
# repository that need to be replaced.
882
if self._real_branch is not None:
883
self._real_branch.repository = new_repository
884
self.repository.lock_write(token=lock_token)
885
if lock_token is not None:
886
old_repository.leave_lock_in_place()
887
old_repository.unlock()
888
if lock_token is not None:
889
# XXX: self.repository.leave_lock_in_place() before this
890
# function will not be preserved. Fortunately that doesn't
891
# affect the current default format (2a), and would be a
892
# corner-case anyway.
893
# - Andrew Bennetts, 2010/06/30
894
self.repository.dont_leave_lock_in_place()
898
old_repository.unlock()
899
except errors.LockNotHeld:
902
if old_lock_count == 0:
903
raise AssertionError(
904
'old_repository should have been locked at least once.')
905
for i in range(old_lock_count-1):
906
self.repository.lock_write()
907
# Fetch from the old repository into the new.
908
old_repository.lock_read()
910
# XXX: If you unstack a branch while it has a working tree
911
# with a pending merge, the pending-merged revisions will no
912
# longer be present. You can (probably) revert and remerge.
914
tags_to_fetch = set(self.tags.get_reverse_tag_dict())
915
except errors.TagsNotSupported:
916
tags_to_fetch = set()
917
fetch_spec = _mod_graph.NotInOtherForRevs(self.repository,
918
old_repository, required_ids=[self.last_revision()],
919
if_present_ids=tags_to_fetch, find_ghosts=True).execute()
920
self.repository.fetch(old_repository, fetch_spec=fetch_spec)
922
old_repository.unlock()
926
694
def _set_tags_bytes(self, bytes):
927
695
"""Mirror method for _get_tags_bytes.
929
697
:seealso: Branch._get_tags_bytes.
931
op = cleanup.OperationWithCleanups(self._set_tags_bytes_locked)
932
op.add_cleanup(self.lock_write().unlock)
933
return op.run_simple(bytes)
935
def _set_tags_bytes_locked(self, bytes):
936
self._tags_bytes = bytes
937
return self._transport.put_bytes('tags', bytes)
699
return _run_with_write_locked_target(self, self._transport.put_bytes,
939
702
def _cache_revision_history(self, rev_history):
940
703
"""Set the cached revision history to rev_history.
1027
788
:return: A tuple (revno, revision_id).
1029
790
if self._last_revision_info_cache is None:
1030
self._last_revision_info_cache = self._read_last_revision_info()
791
self._last_revision_info_cache = self._last_revision_info()
1031
792
return self._last_revision_info_cache
1033
def _read_last_revision_info(self):
1034
raise NotImplementedError(self._read_last_revision_info)
1036
@deprecated_method(deprecated_in((2, 4, 0)))
794
def _last_revision_info(self):
795
rh = self.revision_history()
798
return (revno, rh[-1])
800
return (0, _mod_revision.NULL_REVISION)
802
@deprecated_method(deprecated_in((1, 6, 0)))
803
def missing_revisions(self, other, stop_revision=None):
804
"""Return a list of new revisions that would perfectly fit.
806
If self and other have not diverged, return a list of the revisions
807
present in other, but missing from self.
809
self_history = self.revision_history()
810
self_len = len(self_history)
811
other_history = other.revision_history()
812
other_len = len(other_history)
813
common_index = min(self_len, other_len) -1
814
if common_index >= 0 and \
815
self_history[common_index] != other_history[common_index]:
816
raise errors.DivergedBranches(self, other)
818
if stop_revision is None:
819
stop_revision = other_len
821
if stop_revision > other_len:
822
raise errors.NoSuchRevision(self, stop_revision)
823
return other_history[self_len:stop_revision]
826
def update_revisions(self, other, stop_revision=None, overwrite=False,
828
"""Pull in new perfect-fit revisions.
830
:param other: Another Branch to pull from
831
:param stop_revision: Updated until the given revision
832
:param overwrite: Always set the branch pointer, rather than checking
833
to see if it is a proper descendant.
834
:param graph: A Graph object that can be used to query history
835
information. This can be None.
838
return InterBranch.get(other, self).update_revisions(stop_revision,
1037
841
def import_last_revision_info(self, source_repo, revno, revid):
1038
842
"""Set the last revision info, importing from another repo if necessary.
844
This is used by the bound branch code to upload a revision to
845
the master branch first before updating the tip of the local branch.
1040
847
:param source_repo: Source repository to optionally fetch from
1041
848
:param revno: Revision number of the new tip
1042
849
:param revid: Revision id of the new tip
1360
1178
Callers will typically also want to check the repository.
1362
:param refs: Calculated refs for this branch as specified by
1363
branch._get_check_refs()
1364
1180
:return: A BranchCheckResult.
1366
result = BranchCheckResult(self)
1182
ret = BranchCheckResult(self)
1183
mainline_parent_id = None
1367
1184
last_revno, last_revision_id = self.last_revision_info()
1368
actual_revno = refs[('lefthand-distance', last_revision_id)]
1369
if actual_revno != last_revno:
1370
result.errors.append(errors.BzrCheckError(
1371
'revno does not match len(mainline) %s != %s' % (
1372
last_revno, actual_revno)))
1373
# TODO: We should probably also check that self.revision_history
1374
# matches the repository for older branch formats.
1375
# If looking for the code that cross-checks repository parents against
1376
# the iter_reverse_revision_history output, that is now a repository
1185
real_rev_history = []
1187
for revid in self.repository.iter_reverse_revision_history(
1189
real_rev_history.append(revid)
1190
except errors.RevisionNotPresent:
1191
ret.ghosts_in_mainline = True
1193
ret.ghosts_in_mainline = False
1194
real_rev_history.reverse()
1195
if len(real_rev_history) != last_revno:
1196
raise errors.BzrCheckError('revno does not match len(mainline)'
1197
' %s != %s' % (last_revno, len(real_rev_history)))
1198
# TODO: We should probably also check that real_rev_history actually
1199
# matches self.revision_history()
1200
for revision_id in real_rev_history:
1202
revision = self.repository.get_revision(revision_id)
1203
except errors.NoSuchRevision, e:
1204
raise errors.BzrCheckError("mainline revision {%s} not in repository"
1206
# In general the first entry on the revision history has no parents.
1207
# But it's not illegal for it to have parents listed; this can happen
1208
# in imports from Arch when the parents weren't reachable.
1209
if mainline_parent_id is not None:
1210
if mainline_parent_id not in revision.parent_ids:
1211
raise errors.BzrCheckError("previous revision {%s} not listed among "
1213
% (mainline_parent_id, revision_id))
1214
mainline_parent_id = revision_id
1380
1217
def _get_checkout_format(self):
1381
1218
"""Return the most suitable metadir for a checkout of this branch.
1382
1219
Weaves are used if this branch's repository uses weaves.
1384
format = self.repository.bzrdir.checkout_metadir()
1385
format.set_branch_format(self._format)
1221
if isinstance(self.bzrdir, bzrdir.BzrDirPreSplitOut):
1222
from bzrlib.repofmt import weaverepo
1223
format = bzrdir.BzrDirMetaFormat1()
1224
format.repository_format = weaverepo.RepositoryFormat7()
1226
format = self.repository.bzrdir.checkout_metadir()
1227
format.set_branch_format(self._format)
1388
1230
def create_clone_on_transport(self, to_transport, revision_id=None,
1389
stacked_on=None, create_prefix=False, use_existing_dir=False,
1231
stacked_on=None, create_prefix=False, use_existing_dir=False):
1391
1232
"""Create a clone of this branch and its bzrdir.
1393
1234
:param to_transport: The transport to clone onto.
1813
1605
"basis revision. hooks MUST NOT modify this delta. "
1814
1606
" future_tree is an in-memory tree obtained from "
1815
1607
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1817
self.add_hook('post_commit',
1608
"tree.", (0,91), None))
1609
self.create_hook(HookPoint('post_commit',
1818
1610
"Called in the bzr client after a commit has completed. "
1819
1611
"post_commit is called with (local, master, old_revno, old_revid, "
1820
1612
"new_revno, new_revid). old_revid is NULL_REVISION for the first "
1821
"commit to a branch.", (0, 15))
1822
self.add_hook('post_uncommit',
1613
"commit to a branch.", (0, 15), None))
1614
self.create_hook(HookPoint('post_uncommit',
1823
1615
"Called in the bzr client after an uncommit completes. "
1824
1616
"post_uncommit is called with (local, master, old_revno, "
1825
1617
"old_revid, new_revno, new_revid) where local is the local branch "
1826
1618
"or None, master is the target branch, and an empty branch "
1827
"receives new_revno of 0, new_revid of None.", (0, 15))
1828
self.add_hook('pre_change_branch_tip',
1619
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1620
self.create_hook(HookPoint('pre_change_branch_tip',
1829
1621
"Called in bzr client and server before a change to the tip of a "
1830
1622
"branch is made. pre_change_branch_tip is called with a "
1831
1623
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1832
"commit, uncommit will all trigger this hook.", (1, 6))
1833
self.add_hook('post_change_branch_tip',
1624
"commit, uncommit will all trigger this hook.", (1, 6), None))
1625
self.create_hook(HookPoint('post_change_branch_tip',
1834
1626
"Called in bzr client and server after a change to the tip of a "
1835
1627
"branch is made. post_change_branch_tip is called with a "
1836
1628
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1837
"commit, uncommit will all trigger this hook.", (1, 4))
1838
self.add_hook('transform_fallback_location',
1629
"commit, uncommit will all trigger this hook.", (1, 4), None))
1630
self.create_hook(HookPoint('transform_fallback_location',
1839
1631
"Called when a stacked branch is activating its fallback "
1840
1632
"locations. transform_fallback_location is called with (branch, "
1841
1633
"url), and should return a new url. Returning the same url "
1908
1683
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1911
class BranchInitHookParams(object):
1912
"""Object holding parameters passed to `*_branch_init` hooks.
1914
There are 4 fields that hooks may wish to access:
1916
:ivar format: the branch format
1917
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1918
:ivar name: name of colocated branch, if any (or None)
1919
:ivar branch: the branch created
1921
Note that for lightweight checkouts, the bzrdir and format fields refer to
1922
the checkout, hence they are different from the corresponding fields in
1923
branch, which refer to the original branch.
1926
def __init__(self, format, a_bzrdir, name, branch):
1927
"""Create a group of BranchInitHook parameters.
1929
:param format: the branch format
1930
:param a_bzrdir: the BzrDir where the branch will be/has been
1932
:param name: name of colocated branch, if any (or None)
1933
:param branch: the branch created
1935
Note that for lightweight checkouts, the bzrdir and format fields refer
1936
to the checkout, hence they are different from the corresponding fields
1937
in branch, which refer to the original branch.
1939
self.format = format
1940
self.bzrdir = a_bzrdir
1942
self.branch = branch
1944
def __eq__(self, other):
1945
return self.__dict__ == other.__dict__
1948
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1951
class SwitchHookParams(object):
1952
"""Object holding parameters passed to `*_switch` hooks.
1954
There are 4 fields that hooks may wish to access:
1956
:ivar control_dir: BzrDir of the checkout to change
1957
:ivar to_branch: branch that the checkout is to reference
1958
:ivar force: skip the check for local commits in a heavy checkout
1959
:ivar revision_id: revision ID to switch to (or None)
1962
def __init__(self, control_dir, to_branch, force, revision_id):
1963
"""Create a group of SwitchHook parameters.
1965
:param control_dir: BzrDir of the checkout to change
1966
:param to_branch: branch that the checkout is to reference
1967
:param force: skip the check for local commits in a heavy checkout
1968
:param revision_id: revision ID to switch to (or None)
1970
self.control_dir = control_dir
1971
self.to_branch = to_branch
1973
self.revision_id = revision_id
1975
def __eq__(self, other):
1976
return self.__dict__ == other.__dict__
1979
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1980
self.control_dir, self.to_branch,
1686
class BzrBranchFormat4(BranchFormat):
1687
"""Bzr branch format 4.
1690
- a revision-history file.
1691
- a branch-lock lock file [ to be shared with the bzrdir ]
1694
def get_format_description(self):
1695
"""See BranchFormat.get_format_description()."""
1696
return "Branch format 4"
1698
def initialize(self, a_bzrdir):
1699
"""Create a branch of this format in a_bzrdir."""
1700
utf8_files = [('revision-history', ''),
1701
('branch-name', ''),
1703
return self._initialize_helper(a_bzrdir, utf8_files,
1704
lock_type='branch4', set_format=False)
1707
super(BzrBranchFormat4, self).__init__()
1708
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1710
def network_name(self):
1711
"""The network name for this format is the control dirs disk label."""
1712
return self._matchingbzrdir.get_format_string()
1714
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1715
"""See BranchFormat.open()."""
1717
# we are being called directly and must probe.
1718
raise NotImplementedError
1719
return BzrBranch(_format=self,
1720
_control_files=a_bzrdir._control_files,
1722
_repository=a_bzrdir.open_repository())
1725
return "Bazaar-NG branch format 4"
1984
1728
class BranchFormatMetadir(BranchFormat):
2501
2146
"""See Branch.print_file."""
2502
2147
return self.repository.print_file(file, revision_id)
2149
def _write_revision_history(self, history):
2150
"""Factored out of set_revision_history.
2152
This performs the actual writing to disk.
2153
It is intended to be called by BzrBranch5.set_revision_history."""
2154
self._transport.put_bytes(
2155
'revision-history', '\n'.join(history),
2156
mode=self.bzrdir._get_file_mode())
2159
def set_revision_history(self, rev_history):
2160
"""See Branch.set_revision_history."""
2161
if 'evil' in debug.debug_flags:
2162
mutter_callsite(3, "set_revision_history scales with history.")
2163
check_not_reserved_id = _mod_revision.check_not_reserved_id
2164
for rev_id in rev_history:
2165
check_not_reserved_id(rev_id)
2166
if Branch.hooks['post_change_branch_tip']:
2167
# Don't calculate the last_revision_info() if there are no hooks
2169
old_revno, old_revid = self.last_revision_info()
2170
if len(rev_history) == 0:
2171
revid = _mod_revision.NULL_REVISION
2173
revid = rev_history[-1]
2174
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2175
self._write_revision_history(rev_history)
2176
self._clear_cached_state()
2177
self._cache_revision_history(rev_history)
2178
for hook in Branch.hooks['set_rh']:
2179
hook(self, rev_history)
2180
if Branch.hooks['post_change_branch_tip']:
2181
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2183
def _synchronize_history(self, destination, revision_id):
2184
"""Synchronize last revision and revision history between branches.
2186
This version is most efficient when the destination is also a
2187
BzrBranch5, but works for BzrBranch6 as long as the revision
2188
history is the true lefthand parent history, and all of the revisions
2189
are in the destination's repository. If not, set_revision_history
2192
:param destination: The branch to copy the history into
2193
:param revision_id: The revision-id to truncate history at. May
2194
be None to copy complete history.
2196
if not isinstance(destination._format, BzrBranchFormat5):
2197
super(BzrBranch, self)._synchronize_history(
2198
destination, revision_id)
2200
if revision_id == _mod_revision.NULL_REVISION:
2203
new_history = self.revision_history()
2204
if revision_id is not None and new_history != []:
2206
new_history = new_history[:new_history.index(revision_id) + 1]
2208
rev = self.repository.get_revision(revision_id)
2209
new_history = rev.get_history(self.repository)[1:]
2210
destination.set_revision_history(new_history)
2504
2212
@needs_write_lock
2505
2213
def set_last_revision_info(self, revno, revision_id):
2506
if not revision_id or not isinstance(revision_id, basestring):
2507
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2214
"""Set the last revision of this branch.
2216
The caller is responsible for checking that the revno is correct
2217
for this revision id.
2219
It may be possible to set the branch last revision to an id not
2220
present in the repository. However, branches can also be
2221
configured to check constraints on history, in which case this may not
2508
2224
revision_id = _mod_revision.ensure_null(revision_id)
2509
old_revno, old_revid = self.last_revision_info()
2510
if self._get_append_revisions_only():
2511
self._check_history_violation(revision_id)
2512
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2513
self._write_last_revision_info(revno, revision_id)
2514
self._clear_cached_state()
2515
self._last_revision_info_cache = revno, revision_id
2516
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2225
# this old format stores the full history, but this api doesn't
2226
# provide it, so we must generate, and might as well check it's
2228
history = self._lefthand_history(revision_id)
2229
if len(history) != revno:
2230
raise AssertionError('%d != %d' % (len(history), revno))
2231
self.set_revision_history(history)
2233
def _gen_revision_history(self):
2234
history = self._transport.get_bytes('revision-history').split('\n')
2235
if history[-1:] == ['']:
2236
# There shouldn't be a trailing newline, but just in case.
2241
def generate_revision_history(self, revision_id, last_rev=None,
2243
"""Create a new revision history that will finish with revision_id.
2245
:param revision_id: the new tip to use.
2246
:param last_rev: The previous last_revision. If not None, then this
2247
must be a ancestory of revision_id, or DivergedBranches is raised.
2248
:param other_branch: The other branch that DivergedBranches should
2249
raise with respect to.
2251
self.set_revision_history(self._lefthand_history(revision_id,
2252
last_rev, other_branch))
2518
2254
def basis_tree(self):
2519
2255
"""See Branch.basis_tree."""
2640
def _read_last_revision_info(self):
2641
revision_string = self._transport.get_bytes('last-revision')
2642
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2643
revision_id = cache_utf8.get_cached_utf8(revision_id)
2645
return revno, revision_id
2647
def _write_last_revision_info(self, revno, revision_id):
2648
"""Simply write out the revision id, with no checks.
2650
Use set_last_revision_info to perform this safely.
2652
Does not update the revision_history cache.
2654
revision_id = _mod_revision.ensure_null(revision_id)
2655
out_string = '%d %s\n' % (revno, revision_id)
2656
self._transport.put_bytes('last-revision', out_string,
2657
mode=self.bzrdir._get_file_mode())
2660
class FullHistoryBzrBranch(BzrBranch):
2661
"""Bzr branch which contains the full revision history."""
2664
def set_last_revision_info(self, revno, revision_id):
2665
if not revision_id or not isinstance(revision_id, basestring):
2666
raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2667
revision_id = _mod_revision.ensure_null(revision_id)
2668
# this old format stores the full history, but this api doesn't
2669
# provide it, so we must generate, and might as well check it's
2671
history = self._lefthand_history(revision_id)
2672
if len(history) != revno:
2673
raise AssertionError('%d != %d' % (len(history), revno))
2674
self._set_revision_history(history)
2676
def _read_last_revision_info(self):
2677
rh = self.revision_history()
2680
return (revno, rh[-1])
2682
return (0, _mod_revision.NULL_REVISION)
2684
@deprecated_method(deprecated_in((2, 4, 0)))
2686
def set_revision_history(self, rev_history):
2687
"""See Branch.set_revision_history."""
2688
self._set_revision_history(rev_history)
2690
def _set_revision_history(self, rev_history):
2691
if 'evil' in debug.debug_flags:
2692
mutter_callsite(3, "set_revision_history scales with history.")
2693
check_not_reserved_id = _mod_revision.check_not_reserved_id
2694
for rev_id in rev_history:
2695
check_not_reserved_id(rev_id)
2696
if Branch.hooks['post_change_branch_tip']:
2697
# Don't calculate the last_revision_info() if there are no hooks
2699
old_revno, old_revid = self.last_revision_info()
2700
if len(rev_history) == 0:
2701
revid = _mod_revision.NULL_REVISION
2703
revid = rev_history[-1]
2704
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2705
self._write_revision_history(rev_history)
2706
self._clear_cached_state()
2707
self._cache_revision_history(rev_history)
2708
for hook in Branch.hooks['set_rh']:
2709
hook(self, rev_history)
2710
if Branch.hooks['post_change_branch_tip']:
2711
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2713
def _write_revision_history(self, history):
2714
"""Factored out of set_revision_history.
2716
This performs the actual writing to disk.
2717
It is intended to be called by set_revision_history."""
2718
self._transport.put_bytes(
2719
'revision-history', '\n'.join(history),
2720
mode=self.bzrdir._get_file_mode())
2722
def _gen_revision_history(self):
2723
history = self._transport.get_bytes('revision-history').split('\n')
2724
if history[-1:] == ['']:
2725
# There shouldn't be a trailing newline, but just in case.
2729
def _synchronize_history(self, destination, revision_id):
2730
if not isinstance(destination, FullHistoryBzrBranch):
2731
super(BzrBranch, self)._synchronize_history(
2732
destination, revision_id)
2734
if revision_id == _mod_revision.NULL_REVISION:
2737
new_history = self.revision_history()
2738
if revision_id is not None and new_history != []:
2740
new_history = new_history[:new_history.index(revision_id) + 1]
2742
rev = self.repository.get_revision(revision_id)
2743
new_history = rev.get_history(self.repository)[1:]
2744
destination._set_revision_history(new_history)
2747
def generate_revision_history(self, revision_id, last_rev=None,
2749
"""Create a new revision history that will finish with revision_id.
2751
:param revision_id: the new tip to use.
2752
:param last_rev: The previous last_revision. If not None, then this
2753
must be a ancestory of revision_id, or DivergedBranches is raised.
2754
:param other_branch: The other branch that DivergedBranches should
2755
raise with respect to.
2757
self._set_revision_history(self._lefthand_history(revision_id,
2758
last_rev, other_branch))
2761
class BzrBranch5(FullHistoryBzrBranch):
2762
"""A format 5 branch. This supports new features over plain branches.
2764
It has support for a master_branch which is the data for bound branches.
2768
class BzrBranch8(BzrBranch):
2404
class BzrBranch8(BzrBranch5):
2769
2405
"""A branch that stores tree-reference locations."""
2771
2407
def _open_hook(self):
2797
2433
self._last_revision_info_cache = None
2798
2434
self._reference_info = None
2436
def _last_revision_info(self):
2437
revision_string = self._transport.get_bytes('last-revision')
2438
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2439
revision_id = cache_utf8.get_cached_utf8(revision_id)
2441
return revno, revision_id
2443
def _write_last_revision_info(self, revno, revision_id):
2444
"""Simply write out the revision id, with no checks.
2446
Use set_last_revision_info to perform this safely.
2448
Does not update the revision_history cache.
2449
Intended to be called by set_last_revision_info and
2450
_write_revision_history.
2452
revision_id = _mod_revision.ensure_null(revision_id)
2453
out_string = '%d %s\n' % (revno, revision_id)
2454
self._transport.put_bytes('last-revision', out_string,
2455
mode=self.bzrdir._get_file_mode())
2458
def set_last_revision_info(self, revno, revision_id):
2459
revision_id = _mod_revision.ensure_null(revision_id)
2460
old_revno, old_revid = self.last_revision_info()
2461
if self._get_append_revisions_only():
2462
self._check_history_violation(revision_id)
2463
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2464
self._write_last_revision_info(revno, revision_id)
2465
self._clear_cached_state()
2466
self._last_revision_info_cache = revno, revision_id
2467
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2469
def _synchronize_history(self, destination, revision_id):
2470
"""Synchronize last revision and revision history between branches.
2472
:see: Branch._synchronize_history
2474
# XXX: The base Branch has a fast implementation of this method based
2475
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2476
# that uses set_revision_history. This class inherits from BzrBranch5,
2477
# but wants the fast implementation, so it calls
2478
# Branch._synchronize_history directly.
2479
Branch._synchronize_history(self, destination, revision_id)
2800
2481
def _check_history_violation(self, revision_id):
2801
current_revid = self.last_revision()
2802
last_revision = _mod_revision.ensure_null(current_revid)
2482
last_revision = _mod_revision.ensure_null(self.last_revision())
2803
2483
if _mod_revision.is_null(last_revision):
2805
graph = self.repository.get_graph()
2806
for lh_ancestor in graph.iter_lefthand_ancestry(revision_id):
2807
if lh_ancestor == current_revid:
2809
raise errors.AppendRevisionsOnlyViolation(self.user_url)
2485
if last_revision not in self._lefthand_history(revision_id):
2486
raise errors.AppendRevisionsOnlyViolation(self.base)
2811
2488
def _gen_revision_history(self):
2812
2489
"""Generate the revision history from last revision
3217
2942
raise NotImplementedError(self.push)
3220
def copy_content_into(self, revision_id=None):
3221
"""Copy the content of source into target
3223
revision_id: if not None, the revision history in the new branch will
3224
be truncated to end with revision_id.
3226
raise NotImplementedError(self.copy_content_into)
3229
def fetch(self, stop_revision=None, limit=None):
3232
:param stop_revision: Last revision to fetch
3233
:param limit: Optional rough limit of revisions to fetch
3235
raise NotImplementedError(self.fetch)
3238
2945
class GenericInterBranch(InterBranch):
3239
"""InterBranch implementation that uses public Branch functions."""
3242
def is_compatible(klass, source, target):
3243
# GenericBranch uses the public API, so always compatible
3247
def _get_branch_formats_to_test(klass):
3248
return [(format_registry.get_default(), format_registry.get_default())]
3251
def unwrap_format(klass, format):
3252
if isinstance(format, remote.RemoteBranchFormat):
3253
format._ensure_real()
3254
return format._custom_format
3258
def copy_content_into(self, revision_id=None):
3259
"""Copy the content of source into target
3261
revision_id: if not None, the revision history in the new branch will
3262
be truncated to end with revision_id.
3264
self.source.update_references(self.target)
3265
self.source._synchronize_history(self.target, revision_id)
3267
parent = self.source.get_parent()
3268
except errors.InaccessibleParent, e:
3269
mutter('parent was not accessible to copy: %s', e)
3272
self.target.set_parent(parent)
3273
if self.source._push_should_merge_tags():
3274
self.source.tags.merge_to(self.target.tags)
3277
def fetch(self, stop_revision=None, limit=None):
3278
if self.target.base == self.source.base:
2946
"""InterBranch implementation that uses public Branch functions.
2950
def _get_branch_formats_to_test():
2951
return BranchFormat._default_format, BranchFormat._default_format
2953
def update_revisions(self, stop_revision=None, overwrite=False,
2955
"""See InterBranch.update_revisions()."""
3280
2956
self.source.lock_read()
3282
fetch_spec_factory = fetch.FetchSpecFactory()
3283
fetch_spec_factory.source_branch = self.source
3284
fetch_spec_factory.source_branch_stop_revision_id = stop_revision
3285
fetch_spec_factory.source_repo = self.source.repository
3286
fetch_spec_factory.target_repo = self.target.repository
3287
fetch_spec_factory.target_repo_kind = fetch.TargetRepoKinds.PREEXISTING
3288
fetch_spec_factory.limit = limit
3289
fetch_spec = fetch_spec_factory.make_fetch_spec()
3290
return self.target.repository.fetch(self.source.repository,
3291
fetch_spec=fetch_spec)
2958
other_revno, other_last_revision = self.source.last_revision_info()
2959
stop_revno = None # unknown
2960
if stop_revision is None:
2961
stop_revision = other_last_revision
2962
if _mod_revision.is_null(stop_revision):
2963
# if there are no commits, we're done.
2965
stop_revno = other_revno
2967
# what's the current last revision, before we fetch [and change it
2969
last_rev = _mod_revision.ensure_null(self.target.last_revision())
2970
# we fetch here so that we don't process data twice in the common
2971
# case of having something to pull, and so that the check for
2972
# already merged can operate on the just fetched graph, which will
2973
# be cached in memory.
2974
self.target.fetch(self.source, stop_revision)
2975
# Check to see if one is an ancestor of the other
2978
graph = self.target.repository.get_graph()
2979
if self.target._check_if_descendant_or_diverged(
2980
stop_revision, last_rev, graph, self.source):
2981
# stop_revision is a descendant of last_rev, but we aren't
2982
# overwriting, so we're done.
2984
if stop_revno is None:
2986
graph = self.target.repository.get_graph()
2987
this_revno, this_last_revision = \
2988
self.target.last_revision_info()
2989
stop_revno = graph.find_distance_to_null(stop_revision,
2990
[(other_last_revision, other_revno),
2991
(this_last_revision, this_revno)])
2992
self.target.set_last_revision_info(stop_revno, stop_revision)
3293
2994
self.source.unlock()
3296
def _update_revisions(self, stop_revision=None, overwrite=False,
3298
other_revno, other_last_revision = self.source.last_revision_info()
3299
stop_revno = None # unknown
3300
if stop_revision is None:
3301
stop_revision = other_last_revision
3302
if _mod_revision.is_null(stop_revision):
3303
# if there are no commits, we're done.
3305
stop_revno = other_revno
3307
# what's the current last revision, before we fetch [and change it
3309
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3310
# we fetch here so that we don't process data twice in the common
3311
# case of having something to pull, and so that the check for
3312
# already merged can operate on the just fetched graph, which will
3313
# be cached in memory.
3314
self.fetch(stop_revision=stop_revision)
3315
# Check to see if one is an ancestor of the other
3318
graph = self.target.repository.get_graph()
3319
if self.target._check_if_descendant_or_diverged(
3320
stop_revision, last_rev, graph, self.source):
3321
# stop_revision is a descendant of last_rev, but we aren't
3322
# overwriting, so we're done.
3324
if stop_revno is None:
3326
graph = self.target.repository.get_graph()
3327
this_revno, this_last_revision = \
3328
self.target.last_revision_info()
3329
stop_revno = graph.find_distance_to_null(stop_revision,
3330
[(other_last_revision, other_revno),
3331
(this_last_revision, this_revno)])
3332
self.target.set_last_revision_info(stop_revno, stop_revision)
3335
2996
def pull(self, overwrite=False, stop_revision=None,
3336
possible_transports=None, run_hooks=True,
3337
_override_hook_target=None, local=False):
3338
"""Pull from source into self, updating my master if any.
3340
:param run_hooks: Private parameter - if false, this branch
3341
is being called because it's the master of the primary branch,
3342
so it should not run its hooks.
3344
bound_location = self.target.get_bound_location()
3345
if local and not bound_location:
3346
raise errors.LocalRequiresBoundBranch()
3347
master_branch = None
3348
source_is_master = False
3350
# bound_location comes from a config file, some care has to be
3351
# taken to relate it to source.user_url
3352
normalized = urlutils.normalize_url(bound_location)
3354
relpath = self.source.user_transport.relpath(normalized)
3355
source_is_master = (relpath == '')
3356
except (errors.PathNotChild, errors.InvalidURL):
3357
source_is_master = False
3358
if not local and bound_location and not source_is_master:
3359
# not pulling from master, so we need to update master.
3360
master_branch = self.target.get_master_branch(possible_transports)
3361
master_branch.lock_write()
3364
# pull from source into master.
3365
master_branch.pull(self.source, overwrite, stop_revision,
3367
return self._pull(overwrite,
3368
stop_revision, _hook_master=master_branch,
3369
run_hooks=run_hooks,
3370
_override_hook_target=_override_hook_target,
3371
merge_tags_to_master=not source_is_master)
3374
master_branch.unlock()
3376
def push(self, overwrite=False, stop_revision=None, lossy=False,
3377
_override_hook_source_branch=None):
3378
"""See InterBranch.push.
3380
This is the basic concrete implementation of push()
3382
:param _override_hook_source_branch: If specified, run the hooks
3383
passing this Branch as the source, rather than self. This is for
3384
use of RemoteBranch, where push is delegated to the underlying
3388
raise errors.LossyPushToSameVCS(self.source, self.target)
3389
# TODO: Public option to disable running hooks - should be trivial but
3392
op = cleanup.OperationWithCleanups(self._push_with_bound_branches)
3393
op.add_cleanup(self.source.lock_read().unlock)
3394
op.add_cleanup(self.target.lock_write().unlock)
3395
return op.run(overwrite, stop_revision,
3396
_override_hook_source_branch=_override_hook_source_branch)
3398
def _basic_push(self, overwrite, stop_revision):
3399
"""Basic implementation of push without bound branches or hooks.
3401
Must be called with source read locked and target write locked.
3403
result = BranchPushResult()
3404
result.source_branch = self.source
3405
result.target_branch = self.target
3406
result.old_revno, result.old_revid = self.target.last_revision_info()
3407
self.source.update_references(self.target)
3408
if result.old_revid != stop_revision:
3409
# We assume that during 'push' this repository is closer than
3411
graph = self.source.repository.get_graph(self.target.repository)
3412
self._update_revisions(stop_revision, overwrite=overwrite,
3414
if self.source._push_should_merge_tags():
3415
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3417
result.new_revno, result.new_revid = self.target.last_revision_info()
3420
def _push_with_bound_branches(self, operation, overwrite, stop_revision,
3421
_override_hook_source_branch=None):
3422
"""Push from source into target, and into target's master if any.
3425
if _override_hook_source_branch:
3426
result.source_branch = _override_hook_source_branch
3427
for hook in Branch.hooks['post_push']:
3430
bound_location = self.target.get_bound_location()
3431
if bound_location and self.target.base != bound_location:
3432
# there is a master branch.
3434
# XXX: Why the second check? Is it even supported for a branch to
3435
# be bound to itself? -- mbp 20070507
3436
master_branch = self.target.get_master_branch()
3437
master_branch.lock_write()
3438
operation.add_cleanup(master_branch.unlock)
3439
# push into the master from the source branch.
3440
master_inter = InterBranch.get(self.source, master_branch)
3441
master_inter._basic_push(overwrite, stop_revision)
3442
# and push into the target branch from the source. Note that
3443
# we push from the source branch again, because it's considered
3444
# the highest bandwidth repository.
3445
result = self._basic_push(overwrite, stop_revision)
3446
result.master_branch = master_branch
3447
result.local_branch = self.target
3449
master_branch = None
3451
result = self._basic_push(overwrite, stop_revision)
3452
# TODO: Why set master_branch and local_branch if there's no
3453
# binding? Maybe cleaner to just leave them unset? -- mbp
3455
result.master_branch = self.target
3456
result.local_branch = None
3460
def _pull(self, overwrite=False, stop_revision=None,
3461
2997
possible_transports=None, _hook_master=None, run_hooks=True,
3462
_override_hook_target=None, local=False,
3463
merge_tags_to_master=True):
2998
_override_hook_target=None, local=False):
3464
2999
"""See Branch.pull.
3466
This function is the core worker, used by GenericInterBranch.pull to
3467
avoid duplication when pulling source->master and source->local.
3469
3001
:param _hook_master: Private parameter - set the branch to
3470
3002
be supplied as the master to pull hooks.
3471
3003
:param run_hooks: Private parameter - if false, this branch
3472
3004
is being called because it's the master of the primary branch,
3473
3005
so it should not run its hooks.
3474
is being called because it's the master of the primary branch,
3475
so it should not run its hooks.
3476
3006
:param _override_hook_target: Private parameter - set the branch to be
3477
3007
supplied as the target_branch to pull hooks.
3478
3008
:param local: Only update the local branch, and not the bound branch.
3518
3048
self.source.unlock()
3051
def push(self, overwrite=False, stop_revision=None,
3052
_override_hook_source_branch=None):
3053
"""See InterBranch.push.
3055
This is the basic concrete implementation of push()
3057
:param _override_hook_source_branch: If specified, run
3058
the hooks passing this Branch as the source, rather than self.
3059
This is for use of RemoteBranch, where push is delegated to the
3060
underlying vfs-based Branch.
3062
# TODO: Public option to disable running hooks - should be trivial but
3064
self.source.lock_read()
3066
return _run_with_write_locked_target(
3067
self.target, self._push_with_bound_branches, overwrite,
3069
_override_hook_source_branch=_override_hook_source_branch)
3071
self.source.unlock()
3073
def _push_with_bound_branches(self, overwrite, stop_revision,
3074
_override_hook_source_branch=None):
3075
"""Push from source into target, and into target's master if any.
3078
if _override_hook_source_branch:
3079
result.source_branch = _override_hook_source_branch
3080
for hook in Branch.hooks['post_push']:
3083
bound_location = self.target.get_bound_location()
3084
if bound_location and self.target.base != bound_location:
3085
# there is a master branch.
3087
# XXX: Why the second check? Is it even supported for a branch to
3088
# be bound to itself? -- mbp 20070507
3089
master_branch = self.target.get_master_branch()
3090
master_branch.lock_write()
3092
# push into the master from the source branch.
3093
self.source._basic_push(master_branch, overwrite, stop_revision)
3094
# and push into the target branch from the source. Note that we
3095
# push from the source branch again, because its considered the
3096
# highest bandwidth repository.
3097
result = self.source._basic_push(self.target, overwrite,
3099
result.master_branch = master_branch
3100
result.local_branch = self.target
3104
master_branch.unlock()
3107
result = self.source._basic_push(self.target, overwrite,
3109
# TODO: Why set master_branch and local_branch if there's no
3110
# binding? Maybe cleaner to just leave them unset? -- mbp
3112
result.master_branch = self.target
3113
result.local_branch = None
3118
def is_compatible(self, source, target):
3119
# GenericBranch uses the public API, so always compatible
3123
class InterToBranch5(GenericInterBranch):
3126
def _get_branch_formats_to_test():
3127
return BranchFormat._default_format, BzrBranchFormat5()
3129
def pull(self, overwrite=False, stop_revision=None,
3130
possible_transports=None, run_hooks=True,
3131
_override_hook_target=None, local=False):
3132
"""Pull from source into self, updating my master if any.
3134
:param run_hooks: Private parameter - if false, this branch
3135
is being called because it's the master of the primary branch,
3136
so it should not run its hooks.
3138
bound_location = self.target.get_bound_location()
3139
if local and not bound_location:
3140
raise errors.LocalRequiresBoundBranch()
3141
master_branch = None
3142
if not local and bound_location and self.source.base != bound_location:
3143
# not pulling from master, so we need to update master.
3144
master_branch = self.target.get_master_branch(possible_transports)
3145
master_branch.lock_write()
3148
# pull from source into master.
3149
master_branch.pull(self.source, overwrite, stop_revision,
3151
return super(InterToBranch5, self).pull(overwrite,
3152
stop_revision, _hook_master=master_branch,
3153
run_hooks=run_hooks,
3154
_override_hook_target=_override_hook_target)
3157
master_branch.unlock()
3522
3160
InterBranch.register_optimiser(GenericInterBranch)
3161
InterBranch.register_optimiser(InterToBranch5)
added
removed
bzrlib/branch.py
