456
438
# start_revision_id.
457
439
if self._merge_sorted_revisions_cache is None:
458
440
last_revision = self.last_revision()
459
known_graph = self.repository.get_known_graph_ancestry(
461
self._merge_sorted_revisions_cache = known_graph.merge_sort(
441
graph = self.repository.get_graph()
442
parent_map = dict(((key, value) for key, value in
443
graph.iter_ancestry([last_revision]) if value is not None))
444
revision_graph = repository._strip_NULL_ghosts(parent_map)
445
revs = tsort.merge_sort(revision_graph, last_revision, None,
447
# Drop the sequence # before caching
448
self._merge_sorted_revisions_cache = [r[1:] for r in revs]
463
450
filtered = self._filter_merge_sorted_revisions(
464
451
self._merge_sorted_revisions_cache, start_revision_id,
465
452
stop_revision_id, stop_rule)
466
# Make sure we don't return revisions that are not part of the
467
# start_revision_id ancestry.
468
filtered = self._filter_start_non_ancestors(filtered)
469
453
if direction == 'reverse':
471
455
if direction == 'forward':
478
462
"""Iterate over an inclusive range of sorted revisions."""
479
463
rev_iter = iter(merge_sorted_revisions)
480
464
if start_revision_id is not None:
481
for node in rev_iter:
482
rev_id = node.key[-1]
465
for rev_id, depth, revno, end_of_merge in rev_iter:
483
466
if rev_id != start_revision_id:
486
469
# The decision to include the start or not
487
470
# depends on the stop_rule if a stop is provided
488
# so pop this node back into the iterator
489
rev_iter = chain(iter([node]), rev_iter)
472
iter([(rev_id, depth, revno, end_of_merge)]),
491
475
if stop_revision_id is None:
493
for node in rev_iter:
494
rev_id = node.key[-1]
495
yield (rev_id, node.merge_depth, node.revno,
476
for rev_id, depth, revno, end_of_merge in rev_iter:
477
yield rev_id, depth, revno, end_of_merge
497
478
elif stop_rule == 'exclude':
498
for node in rev_iter:
499
rev_id = node.key[-1]
479
for rev_id, depth, revno, end_of_merge in rev_iter:
500
480
if rev_id == stop_revision_id:
502
yield (rev_id, node.merge_depth, node.revno,
482
yield rev_id, depth, revno, end_of_merge
504
483
elif stop_rule == 'include':
505
for node in rev_iter:
506
rev_id = node.key[-1]
507
yield (rev_id, node.merge_depth, node.revno,
484
for rev_id, depth, revno, end_of_merge in rev_iter:
485
yield rev_id, depth, revno, end_of_merge
509
486
if rev_id == stop_revision_id:
511
elif stop_rule == 'with-merges-without-common-ancestry':
512
# We want to exclude all revisions that are already part of the
513
# stop_revision_id ancestry.
514
graph = self.repository.get_graph()
515
ancestors = graph.find_unique_ancestors(start_revision_id,
517
for node in rev_iter:
518
rev_id = node.key[-1]
519
if rev_id not in ancestors:
521
yield (rev_id, node.merge_depth, node.revno,
523
488
elif stop_rule == 'with-merges':
524
489
stop_rev = self.repository.get_revision(stop_revision_id)
525
490
if stop_rev.parent_ids:
526
491
left_parent = stop_rev.parent_ids[0]
528
493
left_parent = _mod_revision.NULL_REVISION
529
# left_parent is the actual revision we want to stop logging at,
530
# since we want to show the merged revisions after the stop_rev too
531
reached_stop_revision_id = False
532
revision_id_whitelist = []
533
for node in rev_iter:
534
rev_id = node.key[-1]
494
for rev_id, depth, revno, end_of_merge in rev_iter:
535
495
if rev_id == left_parent:
536
# reached the left parent after the stop_revision
538
if (not reached_stop_revision_id or
539
rev_id in revision_id_whitelist):
540
yield (rev_id, node.merge_depth, node.revno,
542
if reached_stop_revision_id or rev_id == stop_revision_id:
543
# only do the merged revs of rev_id from now on
544
rev = self.repository.get_revision(rev_id)
546
reached_stop_revision_id = True
547
revision_id_whitelist.extend(rev.parent_ids)
497
yield rev_id, depth, revno, end_of_merge
549
499
raise ValueError('invalid stop_rule %r' % stop_rule)
551
def _filter_start_non_ancestors(self, rev_iter):
552
# If we started from a dotted revno, we want to consider it as a tip
553
# and don't want to yield revisions that are not part of its
554
# ancestry. Given the order guaranteed by the merge sort, we will see
555
# uninteresting descendants of the first parent of our tip before the
557
first = rev_iter.next()
558
(rev_id, merge_depth, revno, end_of_merge) = first
561
# We start at a mainline revision so by definition, all others
562
# revisions in rev_iter are ancestors
563
for node in rev_iter:
568
pmap = self.repository.get_parent_map([rev_id])
569
parents = pmap.get(rev_id, [])
571
whitelist.update(parents)
573
# If there is no parents, there is nothing of interest left
575
# FIXME: It's hard to test this scenario here as this code is never
576
# called in that case. -- vila 20100322
579
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
581
if rev_id in whitelist:
582
pmap = self.repository.get_parent_map([rev_id])
583
parents = pmap.get(rev_id, [])
584
whitelist.remove(rev_id)
585
whitelist.update(parents)
587
# We've reached the mainline, there is nothing left to
591
# A revision that is not part of the ancestry of our
594
yield (rev_id, merge_depth, revno, end_of_merge)
596
501
def leave_lock_in_place(self):
597
502
"""Tell this branch object not to release the physical lock when this
598
503
object is unlocked.
768
670
except (errors.NotStacked, errors.UnstackableBranchFormat,
769
671
errors.UnstackableRepositoryFormat):
674
# XXX: Lock correctness - should unlock our old repo if we were
676
# repositories don't offer an interface to remove fallback
677
# repositories today; take the conceptually simpler option and just
679
self.repository = self.bzrdir.find_repository()
680
self.repository.lock_write()
681
# for every revision reference the branch has, ensure it is pulled
683
source_repository = self._get_fallback_repository(old_url)
684
for revision_id in chain([self.last_revision()],
685
self.tags.get_reverse_tag_dict()):
686
self.repository.fetch(source_repository, revision_id,
773
689
self._activate_fallback_location(url)
774
690
# write this out after the repository is stacked to avoid setting a
775
691
# stacked config that doesn't work.
776
692
self._set_config_location('stacked_on_location', url)
779
"""Change a branch to be unstacked, copying data as needed.
781
Don't call this directly, use set_stacked_on_url(None).
783
pb = ui.ui_factory.nested_progress_bar()
785
pb.update("Unstacking")
786
# The basic approach here is to fetch the tip of the branch,
787
# including all available ghosts, from the existing stacked
788
# repository into a new repository object without the fallbacks.
790
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
791
# correct for CHKMap repostiories
792
old_repository = self.repository
793
if len(old_repository._fallback_repositories) != 1:
794
raise AssertionError("can't cope with fallback repositories "
795
"of %r" % (self.repository,))
796
# unlock it, including unlocking the fallback
797
old_repository.unlock()
798
old_repository.lock_read()
800
# Repositories don't offer an interface to remove fallback
801
# repositories today; take the conceptually simpler option and just
802
# reopen it. We reopen it starting from the URL so that we
803
# get a separate connection for RemoteRepositories and can
804
# stream from one of them to the other. This does mean doing
805
# separate SSH connection setup, but unstacking is not a
806
# common operation so it's tolerable.
807
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
808
new_repository = new_bzrdir.find_repository()
809
self.repository = new_repository
810
if self.repository._fallback_repositories:
811
raise AssertionError("didn't expect %r to have "
812
"fallback_repositories"
813
% (self.repository,))
814
# this is not paired with an unlock because it's just restoring
815
# the previous state; the lock's released when set_stacked_on_url
817
self.repository.lock_write()
818
# XXX: If you unstack a branch while it has a working tree
819
# with a pending merge, the pending-merged revisions will no
820
# longer be present. You can (probably) revert and remerge.
822
# XXX: This only fetches up to the tip of the repository; it
823
# doesn't bring across any tags. That's fairly consistent
824
# with how branch works, but perhaps not ideal.
825
self.repository.fetch(old_repository,
826
revision_id=self.last_revision(),
829
old_repository.unlock()
833
695
def _set_tags_bytes(self, bytes):
834
696
"""Mirror method for _get_tags_bytes.
1312
1179
Callers will typically also want to check the repository.
1314
:param refs: Calculated refs for this branch as specified by
1315
branch._get_check_refs()
1316
1181
:return: A BranchCheckResult.
1318
result = BranchCheckResult(self)
1183
ret = BranchCheckResult(self)
1184
mainline_parent_id = None
1319
1185
last_revno, last_revision_id = self.last_revision_info()
1320
actual_revno = refs[('lefthand-distance', last_revision_id)]
1321
if actual_revno != last_revno:
1322
result.errors.append(errors.BzrCheckError(
1323
'revno does not match len(mainline) %s != %s' % (
1324
last_revno, actual_revno)))
1325
# TODO: We should probably also check that self.revision_history
1326
# matches the repository for older branch formats.
1327
# If looking for the code that cross-checks repository parents against
1328
# the iter_reverse_revision_history output, that is now a repository
1186
real_rev_history = []
1188
for revid in self.repository.iter_reverse_revision_history(
1190
real_rev_history.append(revid)
1191
except errors.RevisionNotPresent:
1192
ret.ghosts_in_mainline = True
1194
ret.ghosts_in_mainline = False
1195
real_rev_history.reverse()
1196
if len(real_rev_history) != last_revno:
1197
raise errors.BzrCheckError('revno does not match len(mainline)'
1198
' %s != %s' % (last_revno, len(real_rev_history)))
1199
# TODO: We should probably also check that real_rev_history actually
1200
# matches self.revision_history()
1201
for revision_id in real_rev_history:
1203
revision = self.repository.get_revision(revision_id)
1204
except errors.NoSuchRevision, e:
1205
raise errors.BzrCheckError("mainline revision {%s} not in repository"
1207
# In general the first entry on the revision history has no parents.
1208
# But it's not illegal for it to have parents listed; this can happen
1209
# in imports from Arch when the parents weren't reachable.
1210
if mainline_parent_id is not None:
1211
if mainline_parent_id not in revision.parent_ids:
1212
raise errors.BzrCheckError("previous revision {%s} not listed among "
1214
% (mainline_parent_id, revision_id))
1215
mainline_parent_id = revision_id
1332
1218
def _get_checkout_format(self):
1333
1219
"""Return the most suitable metadir for a checkout of this branch.
1564
1444
"""Return the short format description for this format."""
1565
1445
raise NotImplementedError(self.get_format_description)
1567
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1568
hooks = Branch.hooks['post_branch_init']
1571
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1575
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1576
lock_type='metadir', set_format=True):
1447
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1577
1449
"""Initialize a branch in a bzrdir, with specified files
1579
1451
:param a_bzrdir: The bzrdir to initialize the branch in
1580
1452
:param utf8_files: The files to create as a list of
1581
1453
(filename, content) tuples
1582
:param name: Name of colocated branch to create, if any
1583
1454
:param set_format: If True, set the format with
1584
1455
self.get_format_string. (BzrBranch4 has its format set
1586
1457
:return: a branch in this format
1588
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1589
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1459
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1460
branch_transport = a_bzrdir.get_branch_transport(self)
1591
1462
'metadir': ('lock', lockdir.LockDir),
1592
1463
'branch4': ('branch-lock', lockable_files.TransportLock),
1775
1640
"multiple hooks installed for transform_fallback_location, "
1776
1641
"all are called with the url returned from the previous hook."
1777
1642
"The order is however undefined.", (1, 9), None))
1778
self.create_hook(HookPoint('automatic_tag_name',
1779
"Called to determine an automatic tag name for a revision."
1780
"automatic_tag_name is called with (branch, revision_id) and "
1781
"should return a tag name or None if no tag name could be "
1782
"determined. The first non-None tag name returned will be used.",
1784
self.create_hook(HookPoint('post_branch_init',
1785
"Called after new branch initialization completes. "
1786
"post_branch_init is called with a "
1787
"bzrlib.branch.BranchInitHookParams. "
1788
"Note that init, branch and checkout (both heavyweight and "
1789
"lightweight) will all trigger this hook.", (2, 2), None))
1790
self.create_hook(HookPoint('post_switch',
1791
"Called after a checkout switches branch. "
1792
"post_switch is called with a "
1793
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1797
1645
# install the default hooks into the Branch class.
1836
1684
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1839
class BranchInitHookParams(object):
1840
"""Object holding parameters passed to *_branch_init hooks.
1842
There are 4 fields that hooks may wish to access:
1844
:ivar format: the branch format
1845
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1846
:ivar name: name of colocated branch, if any (or None)
1847
:ivar branch: the branch created
1849
Note that for lightweight checkouts, the bzrdir and format fields refer to
1850
the checkout, hence they are different from the corresponding fields in
1851
branch, which refer to the original branch.
1854
def __init__(self, format, a_bzrdir, name, branch):
1855
"""Create a group of BranchInitHook parameters.
1857
:param format: the branch format
1858
:param a_bzrdir: the BzrDir where the branch will be/has been
1860
:param name: name of colocated branch, if any (or None)
1861
:param branch: the branch created
1863
Note that for lightweight checkouts, the bzrdir and format fields refer
1864
to the checkout, hence they are different from the corresponding fields
1865
in branch, which refer to the original branch.
1867
self.format = format
1868
self.bzrdir = a_bzrdir
1870
self.branch = branch
1872
def __eq__(self, other):
1873
return self.__dict__ == other.__dict__
1877
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1879
return "<%s of format:%s bzrdir:%s>" % (
1880
self.__class__.__name__, self.branch,
1881
self.format, self.bzrdir)
1884
class SwitchHookParams(object):
1885
"""Object holding parameters passed to *_switch hooks.
1887
There are 4 fields that hooks may wish to access:
1889
:ivar control_dir: BzrDir of the checkout to change
1890
:ivar to_branch: branch that the checkout is to reference
1891
:ivar force: skip the check for local commits in a heavy checkout
1892
:ivar revision_id: revision ID to switch to (or None)
1895
def __init__(self, control_dir, to_branch, force, revision_id):
1896
"""Create a group of SwitchHook parameters.
1898
:param control_dir: BzrDir of the checkout to change
1899
:param to_branch: branch that the checkout is to reference
1900
:param force: skip the check for local commits in a heavy checkout
1901
:param revision_id: revision ID to switch to (or None)
1903
self.control_dir = control_dir
1904
self.to_branch = to_branch
1906
self.revision_id = revision_id
1908
def __eq__(self, other):
1909
return self.__dict__ == other.__dict__
1912
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1913
self.control_dir, self.to_branch,
1917
1687
class BzrBranchFormat4(BranchFormat):
1918
1688
"""Bzr branch format 4.
1972
1741
return self.get_format_string()
1974
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1743
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1975
1744
"""See BranchFormat.open()."""
1977
format = BranchFormat.find_format(a_bzrdir, name=name)
1746
format = BranchFormat.find_format(a_bzrdir)
1978
1747
if format.__class__ != self.__class__:
1979
1748
raise AssertionError("wrong format %r found for %r" %
1980
1749
(format, self))
1981
transport = a_bzrdir.get_branch_transport(None, name=name)
1751
transport = a_bzrdir.get_branch_transport(None)
1983
1752
control_files = lockable_files.LockableFiles(transport, 'lock',
1984
1753
lockdir.LockDir)
1985
1754
return self._branch_class()(_format=self,
1986
1755
_control_files=control_files,
1988
1756
a_bzrdir=a_bzrdir,
1989
1757
_repository=a_bzrdir.find_repository(),
1990
1758
ignore_fallbacks=ignore_fallbacks)
1991
1759
except errors.NoSuchFile:
1992
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1760
raise errors.NotBranchError(path=transport.base)
1994
1762
def __init__(self):
1995
1763
super(BranchFormatMetadir, self).__init__()
2170
1938
def get_reference(self, a_bzrdir):
2171
1939
"""See BranchFormat.get_reference()."""
2172
1940
transport = a_bzrdir.get_branch_transport(None)
2173
return transport.get_bytes('location')
1941
return transport.get('location').read()
2175
1943
def set_reference(self, a_bzrdir, to_branch):
2176
1944
"""See BranchFormat.set_reference()."""
2177
1945
transport = a_bzrdir.get_branch_transport(None)
2178
1946
location = transport.put_bytes('location', to_branch.base)
2180
def initialize(self, a_bzrdir, name=None, target_branch=None):
1948
def initialize(self, a_bzrdir, target_branch=None):
2181
1949
"""Create a branch of this format in a_bzrdir."""
2182
1950
if target_branch is None:
2183
1951
# this format does not implement branch itself, thus the implicit
2184
1952
# creation contract must see it as uninitializable
2185
1953
raise errors.UninitializableFormat(self)
2186
mutter('creating branch reference in %s', a_bzrdir.user_url)
2187
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1954
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1955
branch_transport = a_bzrdir.get_branch_transport(self)
2188
1956
branch_transport.put_bytes('location',
2189
target_branch.bzrdir.user_url)
1957
target_branch.bzrdir.root_transport.base)
2190
1958
branch_transport.put_bytes('format', self.get_format_string())
2192
a_bzrdir, name, _found=True,
1960
a_bzrdir, _found=True,
2193
1961
possible_transports=[target_branch.bzrdir.root_transport])
2194
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2197
1963
def __init__(self):
2198
1964
super(BranchReferenceFormat, self).__init__()
2204
1970
def clone(to_bzrdir, revision_id=None,
2205
1971
repository_policy=None):
2206
1972
"""See Branch.clone()."""
2207
return format.initialize(to_bzrdir, target_branch=a_branch)
1973
return format.initialize(to_bzrdir, a_branch)
2208
1974
# cannot obey revision_id limits when cloning a reference ...
2209
1975
# FIXME RBC 20060210 either nuke revision_id for clone, or
2210
1976
# emit some sort of warning/error to the caller ?!
2213
def open(self, a_bzrdir, name=None, _found=False, location=None,
1979
def open(self, a_bzrdir, _found=False, location=None,
2214
1980
possible_transports=None, ignore_fallbacks=False):
2215
1981
"""Return the branch that the branch reference in a_bzrdir points at.
2217
1983
:param a_bzrdir: A BzrDir that contains a branch.
2218
:param name: Name of colocated branch to open, if any
2219
1984
:param _found: a private parameter, do not use it. It is used to
2220
1985
indicate if format probing has already be done.
2221
1986
:param ignore_fallbacks: when set, no fallback branches will be opened
2268
2032
BranchFormat.register_format(__format6)
2269
2033
BranchFormat.register_format(__format7)
2270
2034
BranchFormat.register_format(__format8)
2271
BranchFormat.set_default_format(__format7)
2035
BranchFormat.set_default_format(__format6)
2272
2036
_legacy_formats = [BzrBranchFormat4(),
2274
2038
network_format_registry.register(
2275
2039
_legacy_formats[0].network_name(), _legacy_formats[0].__class__)
2278
class BranchWriteLockResult(LogicalLockResult):
2279
"""The result of write locking a branch.
2281
:ivar branch_token: The token obtained from the underlying branch lock, or
2283
:ivar unlock: A callable which will unlock the lock.
2286
def __init__(self, unlock, branch_token):
2287
LogicalLockResult.__init__(self, unlock)
2288
self.branch_token = branch_token
2291
return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2295
class BzrBranch(Branch, _RelockDebugMixin):
2042
class BzrBranch(Branch):
2296
2043
"""A branch stored in the actual filesystem.
2298
2045
Note that it's "local" in the context of the filesystem; it doesn't
2304
2051
:ivar repository: Repository for this branch.
2305
2052
:ivar base: The url of the base directory for this branch; the one
2306
2053
containing the .bzr directory.
2307
:ivar name: Optional colocated branch name as it exists in the control
2311
2056
def __init__(self, _format=None,
2312
_control_files=None, a_bzrdir=None, name=None,
2313
_repository=None, ignore_fallbacks=False):
2057
_control_files=None, a_bzrdir=None, _repository=None,
2058
ignore_fallbacks=False):
2314
2059
"""Create new branch object at a particular location."""
2315
2060
if a_bzrdir is None:
2316
2061
raise ValueError('a_bzrdir must be supplied')
2318
2063
self.bzrdir = a_bzrdir
2319
2064
self._base = self.bzrdir.transport.clone('..').base
2321
2065
# XXX: We should be able to just do
2322
2066
# self.base = self.bzrdir.root_transport.base
2323
2067
# but this does not quite work yet -- mbp 20080522
2351
2091
return self.control_files.is_locked()
2353
2093
def lock_write(self, token=None):
2354
"""Lock the branch for write operations.
2356
:param token: A token to permit reacquiring a previously held and
2358
:return: A BranchWriteLockResult.
2360
if not self.is_locked():
2361
self._note_lock('w')
2362
2094
# All-in-one needs to always unlock/lock.
2363
2095
repo_control = getattr(self.repository, 'control_files', None)
2364
2096
if self.control_files == repo_control or not self.is_locked():
2365
self.repository._warn_if_deprecated(self)
2366
2097
self.repository.lock_write()
2367
2098
took_lock = True
2369
2100
took_lock = False
2371
return BranchWriteLockResult(self.unlock,
2372
self.control_files.lock_write(token=token))
2102
return self.control_files.lock_write(token=token)
2375
2105
self.repository.unlock()
2378
2108
def lock_read(self):
2379
"""Lock the branch for read operations.
2381
:return: A bzrlib.lock.LogicalLockResult.
2383
if not self.is_locked():
2384
self._note_lock('r')
2385
2109
# All-in-one needs to always unlock/lock.
2386
2110
repo_control = getattr(self.repository, 'control_files', None)
2387
2111
if self.control_files == repo_control or not self.is_locked():
2388
self.repository._warn_if_deprecated(self)
2389
2112
self.repository.lock_read()
2390
2113
took_lock = True
2392
2115
took_lock = False
2394
2117
self.control_files.lock_read()
2395
return LogicalLockResult(self.unlock)
2398
2120
self.repository.unlock()
2401
@only_raises(errors.LockNotHeld, errors.LockBroken)
2402
2123
def unlock(self):
2404
2125
self.control_files.unlock()
added
removed
bzrlib/branch.py
