507
442
"""Iterate over an inclusive range of sorted revisions."""
508
443
rev_iter = iter(merge_sorted_revisions)
509
444
if start_revision_id is not None:
510
for node in rev_iter:
445
for rev_id, depth, revno, end_of_merge in rev_iter:
512
446
if rev_id != start_revision_id:
515
449
# The decision to include the start or not
516
450
# 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)
452
iter([(rev_id, depth, revno, end_of_merge)]),
520
455
if stop_revision_id is None:
522
for node in rev_iter:
524
yield (rev_id, node.merge_depth, node.revno,
456
for rev_id, depth, revno, end_of_merge in rev_iter:
457
yield rev_id, depth, revno, end_of_merge
526
458
elif stop_rule == 'exclude':
527
for node in rev_iter:
459
for rev_id, depth, revno, end_of_merge in rev_iter:
529
460
if rev_id == stop_revision_id:
531
yield (rev_id, node.merge_depth, node.revno,
462
yield rev_id, depth, revno, end_of_merge
533
463
elif stop_rule == 'include':
534
for node in rev_iter:
536
yield (rev_id, node.merge_depth, node.revno,
464
for rev_id, depth, revno, end_of_merge in rev_iter:
465
yield rev_id, depth, revno, end_of_merge
538
466
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
468
elif stop_rule == 'with-merges':
553
469
stop_rev = self.repository.get_revision(stop_revision_id)
554
470
if stop_rev.parent_ids:
555
471
left_parent = stop_rev.parent_ids[0]
557
473
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:
474
for rev_id, depth, revno, end_of_merge in rev_iter:
564
475
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)
477
yield rev_id, depth, revno, end_of_merge
578
479
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
481
def leave_lock_in_place(self):
626
482
"""Tell this branch object not to release the physical lock when this
627
483
object is unlocked.
831
640
except (errors.NotStacked, errors.UnstackableBranchFormat,
832
641
errors.UnstackableRepositoryFormat):
644
# XXX: Lock correctness - should unlock our old repo if we were
646
# repositories don't offer an interface to remove fallback
647
# repositories today; take the conceptually simpler option and just
649
self.repository = self.bzrdir.find_repository()
650
self.repository.lock_write()
651
# for every revision reference the branch has, ensure it is pulled
653
source_repository = self._get_fallback_repository(old_url)
654
for revision_id in chain([self.last_revision()],
655
self.tags.get_reverse_tag_dict()):
656
self.repository.fetch(source_repository, revision_id,
836
self._activate_fallback_location(url)
659
self._activate_fallback_location(url, 'write')
837
660
# write this out after the repository is stacked to avoid setting a
838
661
# stacked config that doesn't work.
839
662
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
665
def _set_tags_bytes(self, bytes):
927
666
"""Mirror method for _get_tags_bytes.
929
668
: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)
670
return _run_with_write_locked_target(self, self._transport.put_bytes,
939
673
def _cache_revision_history(self, rev_history):
940
674
"""Set the cached revision history to rev_history.
1813
1525
"basis revision. hooks MUST NOT modify this delta. "
1814
1526
" future_tree is an in-memory tree obtained from "
1815
1527
"CommitBuilder.revision_tree() and hooks MUST NOT modify this "
1817
self.add_hook('post_commit',
1528
"tree.", (0,91), None))
1529
self.create_hook(HookPoint('post_commit',
1818
1530
"Called in the bzr client after a commit has completed. "
1819
1531
"post_commit is called with (local, master, old_revno, old_revid, "
1820
1532
"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',
1533
"commit to a branch.", (0, 15), None))
1534
self.create_hook(HookPoint('post_uncommit',
1823
1535
"Called in the bzr client after an uncommit completes. "
1824
1536
"post_uncommit is called with (local, master, old_revno, "
1825
1537
"old_revid, new_revno, new_revid) where local is the local branch "
1826
1538
"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',
1539
"receives new_revno of 0, new_revid of None.", (0, 15), None))
1540
self.create_hook(HookPoint('pre_change_branch_tip',
1829
1541
"Called in bzr client and server before a change to the tip of a "
1830
1542
"branch is made. pre_change_branch_tip is called with a "
1831
1543
"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',
1544
"commit, uncommit will all trigger this hook.", (1, 6), None))
1545
self.create_hook(HookPoint('post_change_branch_tip',
1834
1546
"Called in bzr client and server after a change to the tip of a "
1835
1547
"branch is made. post_change_branch_tip is called with a "
1836
1548
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, "
1837
"commit, uncommit will all trigger this hook.", (1, 4))
1838
self.add_hook('transform_fallback_location',
1549
"commit, uncommit will all trigger this hook.", (1, 4), None))
1550
self.create_hook(HookPoint('transform_fallback_location',
1839
1551
"Called when a stacked branch is activating its fallback "
1840
1552
"locations. transform_fallback_location is called with (branch, "
1841
1553
"url), and should return a new url. Returning the same url "
1908
1603
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,
1606
class BzrBranchFormat4(BranchFormat):
1607
"""Bzr branch format 4.
1610
- a revision-history file.
1611
- a branch-lock lock file [ to be shared with the bzrdir ]
1614
def get_format_description(self):
1615
"""See BranchFormat.get_format_description()."""
1616
return "Branch format 4"
1618
def initialize(self, a_bzrdir):
1619
"""Create a branch of this format in a_bzrdir."""
1620
utf8_files = [('revision-history', ''),
1621
('branch-name', ''),
1623
return self._initialize_helper(a_bzrdir, utf8_files,
1624
lock_type='branch4', set_format=False)
1627
super(BzrBranchFormat4, self).__init__()
1628
self._matchingbzrdir = bzrdir.BzrDirFormat6()
1630
def network_name(self):
1631
"""The network name for this format is the control dirs disk label."""
1632
return self._matchingbzrdir.get_format_string()
1634
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1635
"""See BranchFormat.open()."""
1637
# we are being called directly and must probe.
1638
raise NotImplementedError
1639
return BzrBranch(_format=self,
1640
_control_files=a_bzrdir._control_files,
1642
_repository=a_bzrdir.open_repository())
1645
return "Bazaar-NG branch format 4"
1984
1648
class BranchFormatMetadir(BranchFormat):
2501
2058
"""See Branch.print_file."""
2502
2059
return self.repository.print_file(file, revision_id)
2061
def _write_revision_history(self, history):
2062
"""Factored out of set_revision_history.
2064
This performs the actual writing to disk.
2065
It is intended to be called by BzrBranch5.set_revision_history."""
2066
self._transport.put_bytes(
2067
'revision-history', '\n'.join(history),
2068
mode=self.bzrdir._get_file_mode())
2071
def set_revision_history(self, rev_history):
2072
"""See Branch.set_revision_history."""
2073
if 'evil' in debug.debug_flags:
2074
mutter_callsite(3, "set_revision_history scales with history.")
2075
check_not_reserved_id = _mod_revision.check_not_reserved_id
2076
for rev_id in rev_history:
2077
check_not_reserved_id(rev_id)
2078
if Branch.hooks['post_change_branch_tip']:
2079
# Don't calculate the last_revision_info() if there are no hooks
2081
old_revno, old_revid = self.last_revision_info()
2082
if len(rev_history) == 0:
2083
revid = _mod_revision.NULL_REVISION
2085
revid = rev_history[-1]
2086
self._run_pre_change_branch_tip_hooks(len(rev_history), revid)
2087
self._write_revision_history(rev_history)
2088
self._clear_cached_state()
2089
self._cache_revision_history(rev_history)
2090
for hook in Branch.hooks['set_rh']:
2091
hook(self, rev_history)
2092
if Branch.hooks['post_change_branch_tip']:
2093
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2095
def _synchronize_history(self, destination, revision_id):
2096
"""Synchronize last revision and revision history between branches.
2098
This version is most efficient when the destination is also a
2099
BzrBranch5, but works for BzrBranch6 as long as the revision
2100
history is the true lefthand parent history, and all of the revisions
2101
are in the destination's repository. If not, set_revision_history
2104
:param destination: The branch to copy the history into
2105
:param revision_id: The revision-id to truncate history at. May
2106
be None to copy complete history.
2108
if not isinstance(destination._format, BzrBranchFormat5):
2109
super(BzrBranch, self)._synchronize_history(
2110
destination, revision_id)
2112
if revision_id == _mod_revision.NULL_REVISION:
2115
new_history = self.revision_history()
2116
if revision_id is not None and new_history != []:
2118
new_history = new_history[:new_history.index(revision_id) + 1]
2120
rev = self.repository.get_revision(revision_id)
2121
new_history = rev.get_history(self.repository)[1:]
2122
destination.set_revision_history(new_history)
2504
2124
@needs_write_lock
2505
2125
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)
2126
"""Set the last revision of this branch.
2128
The caller is responsible for checking that the revno is correct
2129
for this revision id.
2131
It may be possible to set the branch last revision to an id not
2132
present in the repository. However, branches can also be
2133
configured to check constraints on history, in which case this may not
2508
2136
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)
2137
# this old format stores the full history, but this api doesn't
2138
# provide it, so we must generate, and might as well check it's
2140
history = self._lefthand_history(revision_id)
2141
if len(history) != revno:
2142
raise AssertionError('%d != %d' % (len(history), revno))
2143
self.set_revision_history(history)
2145
def _gen_revision_history(self):
2146
history = self._transport.get_bytes('revision-history').split('\n')
2147
if history[-1:] == ['']:
2148
# There shouldn't be a trailing newline, but just in case.
2153
def generate_revision_history(self, revision_id, last_rev=None,
2155
"""Create a new revision history that will finish with revision_id.
2157
:param revision_id: the new tip to use.
2158
:param last_rev: The previous last_revision. If not None, then this
2159
must be a ancestory of revision_id, or DivergedBranches is raised.
2160
:param other_branch: The other branch that DivergedBranches should
2161
raise with respect to.
2163
self.set_revision_history(self._lefthand_history(revision_id,
2164
last_rev, other_branch))
2518
2166
def basis_tree(self):
2519
2167
"""See Branch.basis_tree."""
2520
2168
return self.repository.revision_tree(self.last_revision())
2171
def pull(self, source, overwrite=False, stop_revision=None,
2172
_hook_master=None, run_hooks=True, possible_transports=None,
2173
_override_hook_target=None):
2176
:param _hook_master: Private parameter - set the branch to
2177
be supplied as the master to pull hooks.
2178
:param run_hooks: Private parameter - if false, this branch
2179
is being called because it's the master of the primary branch,
2180
so it should not run its hooks.
2181
:param _override_hook_target: Private parameter - set the branch to be
2182
supplied as the target_branch to pull hooks.
2184
result = PullResult()
2185
result.source_branch = source
2186
if _override_hook_target is None:
2187
result.target_branch = self
2189
result.target_branch = _override_hook_target
2192
# We assume that during 'pull' the local repository is closer than
2194
source.update_references(self)
2195
graph = self.repository.get_graph(source.repository)
2196
result.old_revno, result.old_revid = self.last_revision_info()
2197
self.update_revisions(source, stop_revision, overwrite=overwrite,
2199
result.tag_conflicts = source.tags.merge_to(self.tags, overwrite)
2200
result.new_revno, result.new_revid = self.last_revision_info()
2202
result.master_branch = _hook_master
2203
result.local_branch = result.target_branch
2205
result.master_branch = result.target_branch
2206
result.local_branch = None
2208
for hook in Branch.hooks['post_pull']:
2522
2214
def _get_parent_location(self):
2523
2215
_locs = ['parent', 'pull', 'x-pull']
2524
2216
for l in _locs:
2224
def push(self, target, overwrite=False, stop_revision=None,
2225
_override_hook_source_branch=None):
2228
This is the basic concrete implementation of push()
2230
:param _override_hook_source_branch: If specified, run
2231
the hooks passing this Branch as the source, rather than self.
2232
This is for use of RemoteBranch, where push is delegated to the
2233
underlying vfs-based Branch.
2235
# TODO: Public option to disable running hooks - should be trivial but
2237
return _run_with_write_locked_target(
2238
target, self._push_with_bound_branches, target, overwrite,
2240
_override_hook_source_branch=_override_hook_source_branch)
2242
def _push_with_bound_branches(self, target, overwrite,
2244
_override_hook_source_branch=None):
2245
"""Push from self into target, and into target's master if any.
2247
This is on the base BzrBranch class even though it doesn't support
2248
bound branches because the *target* might be bound.
2251
if _override_hook_source_branch:
2252
result.source_branch = _override_hook_source_branch
2253
for hook in Branch.hooks['post_push']:
2256
bound_location = target.get_bound_location()
2257
if bound_location and target.base != bound_location:
2258
# there is a master branch.
2260
# XXX: Why the second check? Is it even supported for a branch to
2261
# be bound to itself? -- mbp 20070507
2262
master_branch = target.get_master_branch()
2263
master_branch.lock_write()
2265
# push into the master from this branch.
2266
self._basic_push(master_branch, overwrite, stop_revision)
2267
# and push into the target branch from this. Note that we push from
2268
# this branch again, because its considered the highest bandwidth
2270
result = self._basic_push(target, overwrite, stop_revision)
2271
result.master_branch = master_branch
2272
result.local_branch = target
2276
master_branch.unlock()
2279
result = self._basic_push(target, overwrite, stop_revision)
2280
# TODO: Why set master_branch and local_branch if there's no
2281
# binding? Maybe cleaner to just leave them unset? -- mbp
2283
result.master_branch = target
2284
result.local_branch = None
2288
def _basic_push(self, target, overwrite, stop_revision):
2289
"""Basic implementation of push without bound branches or hooks.
2291
Must be called with self read locked and target write locked.
2293
result = BranchPushResult()
2294
result.source_branch = self
2295
result.target_branch = target
2296
result.old_revno, result.old_revid = target.last_revision_info()
2297
self.update_references(target)
2298
if result.old_revid != self.last_revision():
2299
# We assume that during 'push' this repository is closer than
2301
graph = self.repository.get_graph(target.repository)
2302
target.update_revisions(self, stop_revision, overwrite=overwrite,
2304
if self._push_should_merge_tags():
2305
result.tag_conflicts = self.tags.merge_to(target.tags, overwrite)
2306
result.new_revno, result.new_revid = target.last_revision_info()
2531
2309
def get_stacked_on_url(self):
2532
raise errors.UnstackableBranchFormat(self._format, self.user_url)
2310
raise errors.UnstackableBranchFormat(self._format, self.base)
2534
2312
def set_push_location(self, location):
2535
2313
"""See Branch.set_push_location."""
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):
2453
class BzrBranch8(BzrBranch5):
2769
2454
"""A branch that stores tree-reference locations."""
2771
2456
def _open_hook(self):
2784
2469
raise AssertionError(
2785
2470
"'transform_fallback_location' hook %s returned "
2786
2471
"None, not a URL." % hook_name)
2787
self._activate_fallback_location(url)
2472
self._activate_fallback_location(url, None)
2789
2474
def __init__(self, *args, **kwargs):
2790
2475
self._ignore_fallbacks = kwargs.get('ignore_fallbacks', False)
2791
2476
super(BzrBranch8, self).__init__(*args, **kwargs)
2792
2477
self._last_revision_info_cache = None
2478
self._partial_revision_history_cache = []
2793
2479
self._reference_info = None
2795
2481
def _clear_cached_state(self):
2796
2482
super(BzrBranch8, self)._clear_cached_state()
2797
2483
self._last_revision_info_cache = None
2484
self._partial_revision_history_cache = []
2798
2485
self._reference_info = None
2487
def _last_revision_info(self):
2488
revision_string = self._transport.get_bytes('last-revision')
2489
revno, revision_id = revision_string.rstrip('\n').split(' ', 1)
2490
revision_id = cache_utf8.get_cached_utf8(revision_id)
2492
return revno, revision_id
2494
def _write_last_revision_info(self, revno, revision_id):
2495
"""Simply write out the revision id, with no checks.
2497
Use set_last_revision_info to perform this safely.
2499
Does not update the revision_history cache.
2500
Intended to be called by set_last_revision_info and
2501
_write_revision_history.
2503
revision_id = _mod_revision.ensure_null(revision_id)
2504
out_string = '%d %s\n' % (revno, revision_id)
2505
self._transport.put_bytes('last-revision', out_string,
2506
mode=self.bzrdir._get_file_mode())
2509
def set_last_revision_info(self, revno, revision_id):
2510
revision_id = _mod_revision.ensure_null(revision_id)
2511
old_revno, old_revid = self.last_revision_info()
2512
if self._get_append_revisions_only():
2513
self._check_history_violation(revision_id)
2514
self._run_pre_change_branch_tip_hooks(revno, revision_id)
2515
self._write_last_revision_info(revno, revision_id)
2516
self._clear_cached_state()
2517
self._last_revision_info_cache = revno, revision_id
2518
self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2520
def _synchronize_history(self, destination, revision_id):
2521
"""Synchronize last revision and revision history between branches.
2523
:see: Branch._synchronize_history
2525
# XXX: The base Branch has a fast implementation of this method based
2526
# on set_last_revision_info, but BzrBranch/BzrBranch5 have a slower one
2527
# that uses set_revision_history. This class inherits from BzrBranch5,
2528
# but wants the fast implementation, so it calls
2529
# Branch._synchronize_history directly.
2530
Branch._synchronize_history(self, destination, revision_id)
2800
2532
def _check_history_violation(self, revision_id):
2801
current_revid = self.last_revision()
2802
last_revision = _mod_revision.ensure_null(current_revid)
2533
last_revision = _mod_revision.ensure_null(self.last_revision())
2803
2534
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)
2536
if last_revision not in self._lefthand_history(revision_id):
2537
raise errors.AppendRevisionsOnlyViolation(self.base)
2811
2539
def _gen_revision_history(self):
2812
2540
"""Generate the revision history from last revision
3186
2990
_optimisers = []
3187
2991
"""The available optimised InterBranch types."""
3190
def _get_branch_formats_to_test(klass):
3191
"""Return an iterable of format tuples for testing.
3193
:return: An iterable of (from_format, to_format) to use when testing
3194
this InterBranch class. Each InterBranch class should define this
3197
raise NotImplementedError(klass._get_branch_formats_to_test)
3200
def pull(self, overwrite=False, stop_revision=None,
3201
possible_transports=None, local=False):
3202
"""Mirror source into target branch.
3204
The target branch is considered to be 'local', having low latency.
3206
:returns: PullResult instance
3208
raise NotImplementedError(self.pull)
3211
def push(self, overwrite=False, stop_revision=None, lossy=False,
3212
_override_hook_source_branch=None):
3213
"""Mirror the source branch into the target branch.
3215
The source branch is considered to be 'local', having low latency.
3217
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)
2994
def _get_branch_formats_to_test():
2995
"""Return a tuple with the Branch formats to use when testing."""
2996
raise NotImplementedError(self._get_branch_formats_to_test)
2998
def update_revisions(self, stop_revision=None, overwrite=False,
3000
"""Pull in new perfect-fit revisions.
3002
:param stop_revision: Updated until the given revision
3003
:param overwrite: Always set the branch pointer, rather than checking
3004
to see if it is a proper descendant.
3005
:param graph: A Graph object that can be used to query history
3006
information. This can be None.
3009
raise NotImplementedError(self.update_revisions)
3238
3012
class GenericInterBranch(InterBranch):
3239
"""InterBranch implementation that uses public Branch functions."""
3013
"""InterBranch implementation that uses public Branch functions.
3017
def _get_branch_formats_to_test():
3018
return BranchFormat._default_format, BranchFormat._default_format
3020
def update_revisions(self, stop_revision=None, overwrite=False,
3022
"""See InterBranch.update_revisions()."""
3023
self.source.lock_read()
3025
other_revno, other_last_revision = self.source.last_revision_info()
3026
stop_revno = None # unknown
3027
if stop_revision is None:
3028
stop_revision = other_last_revision
3029
if _mod_revision.is_null(stop_revision):
3030
# if there are no commits, we're done.
3032
stop_revno = other_revno
3034
# what's the current last revision, before we fetch [and change it
3036
last_rev = _mod_revision.ensure_null(self.target.last_revision())
3037
# we fetch here so that we don't process data twice in the common
3038
# case of having something to pull, and so that the check for
3039
# already merged can operate on the just fetched graph, which will
3040
# be cached in memory.
3041
self.target.fetch(self.source, stop_revision)
3042
# Check to see if one is an ancestor of the other
3045
graph = self.target.repository.get_graph()
3046
if self.target._check_if_descendant_or_diverged(
3047
stop_revision, last_rev, graph, self.source):
3048
# stop_revision is a descendant of last_rev, but we aren't
3049
# overwriting, so we're done.
3051
if stop_revno is None:
3053
graph = self.target.repository.get_graph()
3054
this_revno, this_last_revision = \
3055
self.target.last_revision_info()
3056
stop_revno = graph.find_distance_to_null(stop_revision,
3057
[(other_last_revision, other_revno),
3058
(this_last_revision, this_revno)])
3059
self.target.set_last_revision_info(stop_revno, stop_revision)
3061
self.source.unlock()
3242
def is_compatible(klass, source, target):
3064
def is_compatible(self, source, target):
3243
3065
# 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:
3280
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)
3293
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
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
possible_transports=None, _hook_master=None, run_hooks=True,
3462
_override_hook_target=None, local=False,
3463
merge_tags_to_master=True):
3466
This function is the core worker, used by GenericInterBranch.pull to
3467
avoid duplication when pulling source->master and source->local.
3469
:param _hook_master: Private parameter - set the branch to
3470
be supplied as the master to pull hooks.
3471
:param run_hooks: Private parameter - if false, this branch
3472
is being called because it's the master of the primary branch,
3473
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
:param _override_hook_target: Private parameter - set the branch to be
3477
supplied as the target_branch to pull hooks.
3478
:param local: Only update the local branch, and not the bound branch.
3480
# This type of branch can't be bound.
3482
raise errors.LocalRequiresBoundBranch()
3483
result = PullResult()
3484
result.source_branch = self.source
3485
if _override_hook_target is None:
3486
result.target_branch = self.target
3488
result.target_branch = _override_hook_target
3489
self.source.lock_read()
3491
# We assume that during 'pull' the target repository is closer than
3493
self.source.update_references(self.target)
3494
graph = self.target.repository.get_graph(self.source.repository)
3495
# TODO: Branch formats should have a flag that indicates
3496
# that revno's are expensive, and pull() should honor that flag.
3498
result.old_revno, result.old_revid = \
3499
self.target.last_revision_info()
3500
self._update_revisions(stop_revision, overwrite=overwrite,
3502
# TODO: The old revid should be specified when merging tags,
3503
# so a tags implementation that versions tags can only
3504
# pull in the most recent changes. -- JRV20090506
3505
result.tag_conflicts = self.source.tags.merge_to(self.target.tags,
3506
overwrite, ignore_master=not merge_tags_to_master)
3507
result.new_revno, result.new_revid = self.target.last_revision_info()
3509
result.master_branch = _hook_master
3510
result.local_branch = result.target_branch
3512
result.master_branch = result.target_branch
3513
result.local_branch = None
3515
for hook in Branch.hooks['post_pull']:
3518
self.source.unlock()
3522
3069
InterBranch.register_optimiser(GenericInterBranch)
added
removed
bzrlib/branch.py
