457
436
# start_revision_id.
458
437
if self._merge_sorted_revisions_cache is None:
459
438
last_revision = self.last_revision()
460
known_graph = self.repository.get_known_graph_ancestry(
462
self._merge_sorted_revisions_cache = known_graph.merge_sort(
439
graph = self.repository.get_graph()
440
parent_map = dict(((key, value) for key, value in
441
graph.iter_ancestry([last_revision]) if value is not None))
442
revision_graph = repository._strip_NULL_ghosts(parent_map)
443
revs = tsort.merge_sort(revision_graph, last_revision, None,
445
# Drop the sequence # before caching
446
self._merge_sorted_revisions_cache = [r[1:] for r in revs]
464
448
filtered = self._filter_merge_sorted_revisions(
465
449
self._merge_sorted_revisions_cache, start_revision_id,
466
450
stop_revision_id, stop_rule)
467
# Make sure we don't return revisions that are not part of the
468
# start_revision_id ancestry.
469
filtered = self._filter_start_non_ancestors(filtered)
470
451
if direction == 'reverse':
472
453
if direction == 'forward':
479
460
"""Iterate over an inclusive range of sorted revisions."""
480
461
rev_iter = iter(merge_sorted_revisions)
481
462
if start_revision_id is not None:
482
for node in rev_iter:
483
rev_id = node.key[-1]
463
for rev_id, depth, revno, end_of_merge in rev_iter:
484
464
if rev_id != start_revision_id:
487
467
# The decision to include the start or not
488
468
# depends on the stop_rule if a stop is provided
489
# so pop this node back into the iterator
490
rev_iter = chain(iter([node]), rev_iter)
470
iter([(rev_id, depth, revno, end_of_merge)]),
492
473
if stop_revision_id is None:
494
for node in rev_iter:
495
rev_id = node.key[-1]
496
yield (rev_id, node.merge_depth, node.revno,
474
for rev_id, depth, revno, end_of_merge in rev_iter:
475
yield rev_id, depth, revno, end_of_merge
498
476
elif stop_rule == 'exclude':
499
for node in rev_iter:
500
rev_id = node.key[-1]
477
for rev_id, depth, revno, end_of_merge in rev_iter:
501
478
if rev_id == stop_revision_id:
503
yield (rev_id, node.merge_depth, node.revno,
480
yield rev_id, depth, revno, end_of_merge
505
481
elif stop_rule == 'include':
506
for node in rev_iter:
507
rev_id = node.key[-1]
508
yield (rev_id, node.merge_depth, node.revno,
482
for rev_id, depth, revno, end_of_merge in rev_iter:
483
yield rev_id, depth, revno, end_of_merge
510
484
if rev_id == stop_revision_id:
512
elif stop_rule == 'with-merges-without-common-ancestry':
513
# We want to exclude all revisions that are already part of the
514
# stop_revision_id ancestry.
515
graph = self.repository.get_graph()
516
ancestors = graph.find_unique_ancestors(start_revision_id,
518
for node in rev_iter:
519
rev_id = node.key[-1]
520
if rev_id not in ancestors:
522
yield (rev_id, node.merge_depth, node.revno,
524
486
elif stop_rule == 'with-merges':
525
487
stop_rev = self.repository.get_revision(stop_revision_id)
526
488
if stop_rev.parent_ids:
527
489
left_parent = stop_rev.parent_ids[0]
529
491
left_parent = _mod_revision.NULL_REVISION
530
# left_parent is the actual revision we want to stop logging at,
531
# since we want to show the merged revisions after the stop_rev too
532
reached_stop_revision_id = False
533
revision_id_whitelist = []
534
for node in rev_iter:
535
rev_id = node.key[-1]
492
for rev_id, depth, revno, end_of_merge in rev_iter:
536
493
if rev_id == left_parent:
537
# reached the left parent after the stop_revision
539
if (not reached_stop_revision_id or
540
rev_id in revision_id_whitelist):
541
yield (rev_id, node.merge_depth, node.revno,
543
if reached_stop_revision_id or rev_id == stop_revision_id:
544
# only do the merged revs of rev_id from now on
545
rev = self.repository.get_revision(rev_id)
547
reached_stop_revision_id = True
548
revision_id_whitelist.extend(rev.parent_ids)
495
yield rev_id, depth, revno, end_of_merge
550
497
raise ValueError('invalid stop_rule %r' % stop_rule)
552
def _filter_start_non_ancestors(self, rev_iter):
553
# If we started from a dotted revno, we want to consider it as a tip
554
# and don't want to yield revisions that are not part of its
555
# ancestry. Given the order guaranteed by the merge sort, we will see
556
# uninteresting descendants of the first parent of our tip before the
558
first = rev_iter.next()
559
(rev_id, merge_depth, revno, end_of_merge) = first
562
# We start at a mainline revision so by definition, all others
563
# revisions in rev_iter are ancestors
564
for node in rev_iter:
569
pmap = self.repository.get_parent_map([rev_id])
570
parents = pmap.get(rev_id, [])
572
whitelist.update(parents)
574
# If there is no parents, there is nothing of interest left
576
# FIXME: It's hard to test this scenario here as this code is never
577
# called in that case. -- vila 20100322
580
for (rev_id, merge_depth, revno, end_of_merge) in rev_iter:
582
if rev_id in whitelist:
583
pmap = self.repository.get_parent_map([rev_id])
584
parents = pmap.get(rev_id, [])
585
whitelist.remove(rev_id)
586
whitelist.update(parents)
588
# We've reached the mainline, there is nothing left to
592
# A revision that is not part of the ancestry of our
595
yield (rev_id, merge_depth, revno, end_of_merge)
597
499
def leave_lock_in_place(self):
598
500
"""Tell this branch object not to release the physical lock when this
599
501
object is unlocked.
769
668
except (errors.NotStacked, errors.UnstackableBranchFormat,
770
669
errors.UnstackableRepositoryFormat):
672
# XXX: Lock correctness - should unlock our old repo if we were
674
# repositories don't offer an interface to remove fallback
675
# repositories today; take the conceptually simpler option and just
677
self.repository = self.bzrdir.find_repository()
678
self.repository.lock_write()
679
# for every revision reference the branch has, ensure it is pulled
681
source_repository = self._get_fallback_repository(old_url)
682
for revision_id in chain([self.last_revision()],
683
self.tags.get_reverse_tag_dict()):
684
self.repository.fetch(source_repository, revision_id,
774
687
self._activate_fallback_location(url)
775
688
# write this out after the repository is stacked to avoid setting a
776
689
# stacked config that doesn't work.
777
690
self._set_config_location('stacked_on_location', url)
780
"""Change a branch to be unstacked, copying data as needed.
782
Don't call this directly, use set_stacked_on_url(None).
784
pb = ui.ui_factory.nested_progress_bar()
786
pb.update("Unstacking")
787
# The basic approach here is to fetch the tip of the branch,
788
# including all available ghosts, from the existing stacked
789
# repository into a new repository object without the fallbacks.
791
# XXX: See <https://launchpad.net/bugs/397286> - this may not be
792
# correct for CHKMap repostiories
793
old_repository = self.repository
794
if len(old_repository._fallback_repositories) != 1:
795
raise AssertionError("can't cope with fallback repositories "
796
"of %r" % (self.repository,))
797
# unlock it, including unlocking the fallback
798
old_repository.unlock()
799
old_repository.lock_read()
801
# Repositories don't offer an interface to remove fallback
802
# repositories today; take the conceptually simpler option and just
803
# reopen it. We reopen it starting from the URL so that we
804
# get a separate connection for RemoteRepositories and can
805
# stream from one of them to the other. This does mean doing
806
# separate SSH connection setup, but unstacking is not a
807
# common operation so it's tolerable.
808
new_bzrdir = bzrdir.BzrDir.open(self.bzrdir.root_transport.base)
809
new_repository = new_bzrdir.find_repository()
810
self.repository = new_repository
811
if self.repository._fallback_repositories:
812
raise AssertionError("didn't expect %r to have "
813
"fallback_repositories"
814
% (self.repository,))
815
# this is not paired with an unlock because it's just restoring
816
# the previous state; the lock's released when set_stacked_on_url
818
self.repository.lock_write()
819
# XXX: If you unstack a branch while it has a working tree
820
# with a pending merge, the pending-merged revisions will no
821
# longer be present. You can (probably) revert and remerge.
823
# XXX: This only fetches up to the tip of the repository; it
824
# doesn't bring across any tags. That's fairly consistent
825
# with how branch works, but perhaps not ideal.
826
self.repository.fetch(old_repository,
827
revision_id=self.last_revision(),
830
old_repository.unlock()
834
693
def _set_tags_bytes(self, bytes):
835
694
"""Mirror method for _get_tags_bytes.
1313
1177
Callers will typically also want to check the repository.
1315
:param refs: Calculated refs for this branch as specified by
1316
branch._get_check_refs()
1317
1179
:return: A BranchCheckResult.
1319
result = BranchCheckResult(self)
1181
ret = BranchCheckResult(self)
1182
mainline_parent_id = None
1320
1183
last_revno, last_revision_id = self.last_revision_info()
1321
actual_revno = refs[('lefthand-distance', last_revision_id)]
1322
if actual_revno != last_revno:
1323
result.errors.append(errors.BzrCheckError(
1324
'revno does not match len(mainline) %s != %s' % (
1325
last_revno, actual_revno)))
1326
# TODO: We should probably also check that self.revision_history
1327
# matches the repository for older branch formats.
1328
# If looking for the code that cross-checks repository parents against
1329
# the iter_reverse_revision_history output, that is now a repository
1184
real_rev_history = []
1186
for revid in self.repository.iter_reverse_revision_history(
1188
real_rev_history.append(revid)
1189
except errors.RevisionNotPresent:
1190
ret.ghosts_in_mainline = True
1192
ret.ghosts_in_mainline = False
1193
real_rev_history.reverse()
1194
if len(real_rev_history) != last_revno:
1195
raise errors.BzrCheckError('revno does not match len(mainline)'
1196
' %s != %s' % (last_revno, len(real_rev_history)))
1197
# TODO: We should probably also check that real_rev_history actually
1198
# matches self.revision_history()
1199
for revision_id in real_rev_history:
1201
revision = self.repository.get_revision(revision_id)
1202
except errors.NoSuchRevision, e:
1203
raise errors.BzrCheckError("mainline revision {%s} not in repository"
1205
# In general the first entry on the revision history has no parents.
1206
# But it's not illegal for it to have parents listed; this can happen
1207
# in imports from Arch when the parents weren't reachable.
1208
if mainline_parent_id is not None:
1209
if mainline_parent_id not in revision.parent_ids:
1210
raise errors.BzrCheckError("previous revision {%s} not listed among "
1212
% (mainline_parent_id, revision_id))
1213
mainline_parent_id = revision_id
1333
1216
def _get_checkout_format(self):
1334
1217
"""Return the most suitable metadir for a checkout of this branch.
1565
1442
"""Return the short format description for this format."""
1566
1443
raise NotImplementedError(self.get_format_description)
1568
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1569
hooks = Branch.hooks['post_branch_init']
1572
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1576
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1577
lock_type='metadir', set_format=True):
1445
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1578
1447
"""Initialize a branch in a bzrdir, with specified files
1580
1449
:param a_bzrdir: The bzrdir to initialize the branch in
1581
1450
:param utf8_files: The files to create as a list of
1582
1451
(filename, content) tuples
1583
:param name: Name of colocated branch to create, if any
1584
1452
:param set_format: If True, set the format with
1585
1453
self.get_format_string. (BzrBranch4 has its format set
1587
1455
:return: a branch in this format
1589
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1590
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1457
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1458
branch_transport = a_bzrdir.get_branch_transport(self)
1592
1460
'metadir': ('lock', lockdir.LockDir),
1593
1461
'branch4': ('branch-lock', lockable_files.TransportLock),
1776
1638
"multiple hooks installed for transform_fallback_location, "
1777
1639
"all are called with the url returned from the previous hook."
1778
1640
"The order is however undefined.", (1, 9), None))
1779
self.create_hook(HookPoint('automatic_tag_name',
1780
"Called to determine an automatic tag name for a revision."
1781
"automatic_tag_name is called with (branch, revision_id) and "
1782
"should return a tag name or None if no tag name could be "
1783
"determined. The first non-None tag name returned will be used.",
1785
self.create_hook(HookPoint('post_branch_init',
1786
"Called after new branch initialization completes. "
1787
"post_branch_init is called with a "
1788
"bzrlib.branch.BranchInitHookParams. "
1789
"Note that init, branch and checkout (both heavyweight and "
1790
"lightweight) will all trigger this hook.", (2, 2), None))
1791
self.create_hook(HookPoint('post_switch',
1792
"Called after a checkout switches branch. "
1793
"post_switch is called with a "
1794
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1798
1643
# install the default hooks into the Branch class.
1837
1682
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1840
class BranchInitHookParams(object):
1841
"""Object holding parameters passed to *_branch_init hooks.
1843
There are 4 fields that hooks may wish to access:
1845
:ivar format: the branch format
1846
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1847
:ivar name: name of colocated branch, if any (or None)
1848
:ivar branch: the branch created
1850
Note that for lightweight checkouts, the bzrdir and format fields refer to
1851
the checkout, hence they are different from the corresponding fields in
1852
branch, which refer to the original branch.
1855
def __init__(self, format, a_bzrdir, name, branch):
1856
"""Create a group of BranchInitHook parameters.
1858
:param format: the branch format
1859
:param a_bzrdir: the BzrDir where the branch will be/has been
1861
:param name: name of colocated branch, if any (or None)
1862
:param branch: the branch created
1864
Note that for lightweight checkouts, the bzrdir and format fields refer
1865
to the checkout, hence they are different from the corresponding fields
1866
in branch, which refer to the original branch.
1868
self.format = format
1869
self.bzrdir = a_bzrdir
1871
self.branch = branch
1873
def __eq__(self, other):
1874
return self.__dict__ == other.__dict__
1878
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1880
return "<%s of format:%s bzrdir:%s>" % (
1881
self.__class__.__name__, self.branch,
1882
self.format, self.bzrdir)
1885
class SwitchHookParams(object):
1886
"""Object holding parameters passed to *_switch hooks.
1888
There are 4 fields that hooks may wish to access:
1890
:ivar control_dir: BzrDir of the checkout to change
1891
:ivar to_branch: branch that the checkout is to reference
1892
:ivar force: skip the check for local commits in a heavy checkout
1893
:ivar revision_id: revision ID to switch to (or None)
1896
def __init__(self, control_dir, to_branch, force, revision_id):
1897
"""Create a group of SwitchHook parameters.
1899
:param control_dir: BzrDir of the checkout to change
1900
:param to_branch: branch that the checkout is to reference
1901
:param force: skip the check for local commits in a heavy checkout
1902
:param revision_id: revision ID to switch to (or None)
1904
self.control_dir = control_dir
1905
self.to_branch = to_branch
1907
self.revision_id = revision_id
1909
def __eq__(self, other):
1910
return self.__dict__ == other.__dict__
1913
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1914
self.control_dir, self.to_branch,
1918
1685
class BzrBranchFormat4(BranchFormat):
1919
1686
"""Bzr branch format 4.
1973
1739
return self.get_format_string()
1975
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1741
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1976
1742
"""See BranchFormat.open()."""
1978
format = BranchFormat.find_format(a_bzrdir, name=name)
1744
format = BranchFormat.find_format(a_bzrdir)
1979
1745
if format.__class__ != self.__class__:
1980
1746
raise AssertionError("wrong format %r found for %r" %
1981
1747
(format, self))
1982
transport = a_bzrdir.get_branch_transport(None, name=name)
1749
transport = a_bzrdir.get_branch_transport(None)
1984
1750
control_files = lockable_files.LockableFiles(transport, 'lock',
1985
1751
lockdir.LockDir)
1986
1752
return self._branch_class()(_format=self,
1987
1753
_control_files=control_files,
1989
1754
a_bzrdir=a_bzrdir,
1990
1755
_repository=a_bzrdir.find_repository(),
1991
1756
ignore_fallbacks=ignore_fallbacks)
1992
1757
except errors.NoSuchFile:
1993
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1758
raise errors.NotBranchError(path=transport.base)
1995
1760
def __init__(self):
1996
1761
super(BranchFormatMetadir, self).__init__()
2171
1936
def get_reference(self, a_bzrdir):
2172
1937
"""See BranchFormat.get_reference()."""
2173
1938
transport = a_bzrdir.get_branch_transport(None)
2174
return transport.get_bytes('location')
1939
return transport.get('location').read()
2176
1941
def set_reference(self, a_bzrdir, to_branch):
2177
1942
"""See BranchFormat.set_reference()."""
2178
1943
transport = a_bzrdir.get_branch_transport(None)
2179
1944
location = transport.put_bytes('location', to_branch.base)
2181
def initialize(self, a_bzrdir, name=None, target_branch=None):
1946
def initialize(self, a_bzrdir, target_branch=None):
2182
1947
"""Create a branch of this format in a_bzrdir."""
2183
1948
if target_branch is None:
2184
1949
# this format does not implement branch itself, thus the implicit
2185
1950
# creation contract must see it as uninitializable
2186
1951
raise errors.UninitializableFormat(self)
2187
mutter('creating branch reference in %s', a_bzrdir.user_url)
2188
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1952
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1953
branch_transport = a_bzrdir.get_branch_transport(self)
2189
1954
branch_transport.put_bytes('location',
2190
target_branch.bzrdir.user_url)
1955
target_branch.bzrdir.root_transport.base)
2191
1956
branch_transport.put_bytes('format', self.get_format_string())
2193
a_bzrdir, name, _found=True,
1958
a_bzrdir, _found=True,
2194
1959
possible_transports=[target_branch.bzrdir.root_transport])
2195
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2198
1961
def __init__(self):
2199
1962
super(BranchReferenceFormat, self).__init__()
2205
1968
def clone(to_bzrdir, revision_id=None,
2206
1969
repository_policy=None):
2207
1970
"""See Branch.clone()."""
2208
return format.initialize(to_bzrdir, target_branch=a_branch)
1971
return format.initialize(to_bzrdir, a_branch)
2209
1972
# cannot obey revision_id limits when cloning a reference ...
2210
1973
# FIXME RBC 20060210 either nuke revision_id for clone, or
2211
1974
# emit some sort of warning/error to the caller ?!
2214
def open(self, a_bzrdir, name=None, _found=False, location=None,
1977
def open(self, a_bzrdir, _found=False, location=None,
2215
1978
possible_transports=None, ignore_fallbacks=False):
2216
1979
"""Return the branch that the branch reference in a_bzrdir points at.
2218
1981
:param a_bzrdir: A BzrDir that contains a branch.
2219
:param name: Name of colocated branch to open, if any
2220
1982
:param _found: a private parameter, do not use it. It is used to
2221
1983
indicate if format probing has already be done.
2222
1984
:param ignore_fallbacks: when set, no fallback branches will be opened
2269
2030
BranchFormat.register_format(__format6)
2270
2031
BranchFormat.register_format(__format7)
2271
2032
BranchFormat.register_format(__format8)
2272
BranchFormat.set_default_format(__format7)
2033
BranchFormat.set_default_format(__format6)
2273
2034
_legacy_formats = [BzrBranchFormat4(),
2275
2036
network_format_registry.register(
2276
2037
_legacy_formats[0].network_name(), _legacy_formats[0].__class__)
2279
class BranchWriteLockResult(object):
2280
"""The result of write locking a branch.
2282
:ivar branch_token: The token obtained from the underlying branch lock, or
2284
:ivar unlock: A callable which will unlock the lock.
2287
def __init__(self, unlock, branch_token):
2288
self.branch_token = branch_token
2289
self.unlock = unlock
2292
return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2296
class BzrBranch(Branch, _RelockDebugMixin):
2040
class BzrBranch(Branch):
2297
2041
"""A branch stored in the actual filesystem.
2299
2043
Note that it's "local" in the context of the filesystem; it doesn't
2305
2049
:ivar repository: Repository for this branch.
2306
2050
:ivar base: The url of the base directory for this branch; the one
2307
2051
containing the .bzr directory.
2308
:ivar name: Optional colocated branch name as it exists in the control
2312
2054
def __init__(self, _format=None,
2313
_control_files=None, a_bzrdir=None, name=None,
2314
_repository=None, ignore_fallbacks=False):
2055
_control_files=None, a_bzrdir=None, _repository=None,
2056
ignore_fallbacks=False):
2315
2057
"""Create new branch object at a particular location."""
2316
2058
if a_bzrdir is None:
2317
2059
raise ValueError('a_bzrdir must be supplied')
2319
2061
self.bzrdir = a_bzrdir
2320
2062
self._base = self.bzrdir.transport.clone('..').base
2322
2063
# XXX: We should be able to just do
2323
2064
# self.base = self.bzrdir.root_transport.base
2324
2065
# but this does not quite work yet -- mbp 20080522
2352
2089
return self.control_files.is_locked()
2354
2091
def lock_write(self, token=None):
2355
"""Lock the branch for write operations.
2357
:param token: A token to permit reacquiring a previously held and
2359
:return: A BranchWriteLockResult.
2361
if not self.is_locked():
2362
self._note_lock('w')
2363
2092
# All-in-one needs to always unlock/lock.
2364
2093
repo_control = getattr(self.repository, 'control_files', None)
2365
2094
if self.control_files == repo_control or not self.is_locked():
2366
self.repository._warn_if_deprecated(self)
2367
2095
self.repository.lock_write()
2368
2096
took_lock = True
2370
2098
took_lock = False
2372
return BranchWriteLockResult(self.unlock,
2373
self.control_files.lock_write(token=token))
2100
return self.control_files.lock_write(token=token)
2376
2103
self.repository.unlock()
2379
2106
def lock_read(self):
2380
"""Lock the branch for read operations.
2382
:return: An object with an unlock method which will release the lock
2385
if not self.is_locked():
2386
self._note_lock('r')
2387
2107
# All-in-one needs to always unlock/lock.
2388
2108
repo_control = getattr(self.repository, 'control_files', None)
2389
2109
if self.control_files == repo_control or not self.is_locked():
2390
self.repository._warn_if_deprecated(self)
2391
2110
self.repository.lock_read()
2392
2111
took_lock = True
2394
2113
took_lock = False
2396
2115
self.control_files.lock_read()
2400
2118
self.repository.unlock()
2403
@only_raises(errors.LockNotHeld, errors.LockBroken)
2404
2121
def unlock(self):
2406
2123
self.control_files.unlock()
added
removed
bzrlib/branch.py
