63
63
BZR_BRANCH_FORMAT_6 = "Bazaar Branch Format 6 (bzr 0.15)\n"
66
class Branch(bzrdir.ControlComponent):
66
# TODO: Maybe include checks for common corruption of newlines, etc?
68
# TODO: Some operations like log might retrieve the same revisions
69
# repeatedly to calculate deltas. We could perhaps have a weakref
70
# cache in memory to make this faster. In general anything can be
71
# cached in memory between lock and unlock operations. .. nb thats
72
# what the transaction identity map provides
75
######################################################################
67
79
"""Branch holding a history of revisions.
70
Base directory/url of the branch; using control_url and
71
control_transport is more standardized.
82
Base directory/url of the branch.
73
84
hooks: An instance of BranchHooks.
165
168
control = bzrdir.BzrDir.open(base, _unsupported,
166
169
possible_transports=possible_transports)
167
return control.open_branch(unsupported=_unsupported)
170
return control.open_branch(_unsupported)
170
def open_from_transport(transport, name=None, _unsupported=False):
173
def open_from_transport(transport, _unsupported=False):
171
174
"""Open the branch rooted at transport"""
172
175
control = bzrdir.BzrDir.open_from_transport(transport, _unsupported)
173
return control.open_branch(name=name, unsupported=_unsupported)
176
return control.open_branch(_unsupported)
176
179
def open_containing(url, possible_transports=None):
214
217
def _get_fallback_repository(self, url):
215
218
"""Get the repository we fallback to at url."""
216
219
url = urlutils.join(self.base, url)
217
a_branch = Branch.open(url,
220
a_bzrdir = bzrdir.BzrDir.open(url,
218
221
possible_transports=[self.bzrdir.root_transport])
219
return a_branch.repository
222
return a_bzrdir.open_branch().repository
221
224
def _get_tags_bytes(self):
222
225
"""Get the bytes of a serialised tags dict.
456
447
# start_revision_id.
457
448
if self._merge_sorted_revisions_cache is None:
458
449
last_revision = self.last_revision()
459
known_graph = self.repository.get_known_graph_ancestry(
450
last_key = (last_revision,)
451
known_graph = self.repository.revisions.get_known_graph_ancestry(
461
453
self._merge_sorted_revisions_cache = known_graph.merge_sort(
463
455
filtered = self._filter_merge_sorted_revisions(
464
456
self._merge_sorted_revisions_cache, start_revision_id,
465
457
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
458
if direction == 'reverse':
471
460
if direction == 'forward':
508
497
node.end_of_merge)
509
498
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
500
elif stop_rule == 'with-merges':
524
501
stop_rev = self.repository.get_revision(stop_revision_id)
525
502
if stop_rev.parent_ids:
526
503
left_parent = stop_rev.parent_ids[0]
528
505
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
506
for node in rev_iter:
534
507
rev_id = node.key[-1]
535
508
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,
510
yield (rev_id, node.merge_depth, node.revno,
541
511
node.end_of_merge)
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)
549
513
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
515
def leave_lock_in_place(self):
597
516
"""Tell this branch object not to release the physical lock when this
598
517
object is unlocked.
1436
1360
def supports_tags(self):
1437
1361
return self._format.supports_tags()
1439
def automatic_tag_name(self, revision_id):
1440
"""Try to automatically find the tag name for a revision.
1442
:param revision_id: Revision id of the revision.
1443
:return: A tag name or None if no tag name could be determined.
1445
for hook in Branch.hooks['automatic_tag_name']:
1446
ret = hook(self, revision_id)
1451
1363
def _check_if_descendant_or_diverged(self, revision_a, revision_b, graph,
1453
1365
"""Ensure that revision_b is a descendant of revision_a.
1517
1429
return not (self == other)
1520
def find_format(klass, a_bzrdir, name=None):
1432
def find_format(klass, a_bzrdir):
1521
1433
"""Return the format for the branch object in a_bzrdir."""
1523
transport = a_bzrdir.get_branch_transport(None, name=name)
1435
transport = a_bzrdir.get_branch_transport(None)
1524
1436
format_string = transport.get_bytes("format")
1525
1437
return klass._formats[format_string]
1526
1438
except errors.NoSuchFile:
1527
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1439
raise errors.NotBranchError(path=transport.base)
1528
1440
except KeyError:
1529
1441
raise errors.UnknownFormatError(format=format_string, kind='branch')
1568
1478
"""Return the short format description for this format."""
1569
1479
raise NotImplementedError(self.get_format_description)
1571
def _run_post_branch_init_hooks(self, a_bzrdir, name, branch):
1572
hooks = Branch.hooks['post_branch_init']
1575
params = BranchInitHookParams(self, a_bzrdir, name, branch)
1579
def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
1580
lock_type='metadir', set_format=True):
1481
def _initialize_helper(self, a_bzrdir, utf8_files, lock_type='metadir',
1581
1483
"""Initialize a branch in a bzrdir, with specified files
1583
1485
:param a_bzrdir: The bzrdir to initialize the branch in
1584
1486
:param utf8_files: The files to create as a list of
1585
1487
(filename, content) tuples
1586
:param name: Name of colocated branch to create, if any
1587
1488
:param set_format: If True, set the format with
1588
1489
self.get_format_string. (BzrBranch4 has its format set
1590
1491
:return: a branch in this format
1592
mutter('creating branch %r in %s', self, a_bzrdir.user_url)
1593
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1493
mutter('creating branch %r in %s', self, a_bzrdir.transport.base)
1494
branch_transport = a_bzrdir.get_branch_transport(self)
1595
1496
'metadir': ('lock', lockdir.LockDir),
1596
1497
'branch4': ('branch-lock', lockable_files.TransportLock),
1619
1520
control_files.unlock()
1620
branch = self.open(a_bzrdir, name, _found=True)
1621
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
1521
return self.open(a_bzrdir, _found=True)
1624
def initialize(self, a_bzrdir, name=None):
1625
"""Create a branch of this format in a_bzrdir.
1627
:param name: Name of the colocated branch to create.
1523
def initialize(self, a_bzrdir):
1524
"""Create a branch of this format in a_bzrdir."""
1629
1525
raise NotImplementedError(self.initialize)
1631
1527
def is_supported(self):
1662
1558
raise NotImplementedError(self.network_name)
1664
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1560
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1665
1561
"""Return the branch object for a_bzrdir
1667
1563
:param a_bzrdir: A BzrDir that contains a branch.
1668
:param name: Name of colocated branch to open
1669
1564
:param _found: a private parameter, do not use it. It is used to
1670
1565
indicate if format probing has already be done.
1671
1566
:param ignore_fallbacks: when set, no fallback branches will be opened
1779
1674
"multiple hooks installed for transform_fallback_location, "
1780
1675
"all are called with the url returned from the previous hook."
1781
1676
"The order is however undefined.", (1, 9), None))
1782
self.create_hook(HookPoint('automatic_tag_name',
1783
"Called to determine an automatic tag name for a revision."
1784
"automatic_tag_name is called with (branch, revision_id) and "
1785
"should return a tag name or None if no tag name could be "
1786
"determined. The first non-None tag name returned will be used.",
1788
self.create_hook(HookPoint('post_branch_init',
1789
"Called after new branch initialization completes. "
1790
"post_branch_init is called with a "
1791
"bzrlib.branch.BranchInitHookParams. "
1792
"Note that init, branch and checkout (both heavyweight and "
1793
"lightweight) will all trigger this hook.", (2, 2), None))
1794
self.create_hook(HookPoint('post_switch',
1795
"Called after a checkout switches branch. "
1796
"post_switch is called with a "
1797
"bzrlib.branch.SwitchHookParams.", (2, 2), None))
1801
1679
# install the default hooks into the Branch class.
1840
1718
self.old_revno, self.old_revid, self.new_revno, self.new_revid)
1843
class BranchInitHookParams(object):
1844
"""Object holding parameters passed to *_branch_init hooks.
1846
There are 4 fields that hooks may wish to access:
1848
:ivar format: the branch format
1849
:ivar bzrdir: the BzrDir where the branch will be/has been initialized
1850
:ivar name: name of colocated branch, if any (or None)
1851
:ivar branch: the branch created
1853
Note that for lightweight checkouts, the bzrdir and format fields refer to
1854
the checkout, hence they are different from the corresponding fields in
1855
branch, which refer to the original branch.
1858
def __init__(self, format, a_bzrdir, name, branch):
1859
"""Create a group of BranchInitHook parameters.
1861
:param format: the branch format
1862
:param a_bzrdir: the BzrDir where the branch will be/has been
1864
:param name: name of colocated branch, if any (or None)
1865
:param branch: the branch created
1867
Note that for lightweight checkouts, the bzrdir and format fields refer
1868
to the checkout, hence they are different from the corresponding fields
1869
in branch, which refer to the original branch.
1871
self.format = format
1872
self.bzrdir = a_bzrdir
1874
self.branch = branch
1876
def __eq__(self, other):
1877
return self.__dict__ == other.__dict__
1881
return "<%s of %s>" % (self.__class__.__name__, self.branch)
1883
return "<%s of format:%s bzrdir:%s>" % (
1884
self.__class__.__name__, self.branch,
1885
self.format, self.bzrdir)
1888
class SwitchHookParams(object):
1889
"""Object holding parameters passed to *_switch hooks.
1891
There are 4 fields that hooks may wish to access:
1893
:ivar control_dir: BzrDir of the checkout to change
1894
:ivar to_branch: branch that the checkout is to reference
1895
:ivar force: skip the check for local commits in a heavy checkout
1896
:ivar revision_id: revision ID to switch to (or None)
1899
def __init__(self, control_dir, to_branch, force, revision_id):
1900
"""Create a group of SwitchHook parameters.
1902
:param control_dir: BzrDir of the checkout to change
1903
:param to_branch: branch that the checkout is to reference
1904
:param force: skip the check for local commits in a heavy checkout
1905
:param revision_id: revision ID to switch to (or None)
1907
self.control_dir = control_dir
1908
self.to_branch = to_branch
1910
self.revision_id = revision_id
1912
def __eq__(self, other):
1913
return self.__dict__ == other.__dict__
1916
return "<%s for %s to (%s, %s)>" % (self.__class__.__name__,
1917
self.control_dir, self.to_branch,
1921
1721
class BzrBranchFormat4(BranchFormat):
1922
1722
"""Bzr branch format 4.
1930
1730
"""See BranchFormat.get_format_description()."""
1931
1731
return "Branch format 4"
1933
def initialize(self, a_bzrdir, name=None):
1733
def initialize(self, a_bzrdir):
1934
1734
"""Create a branch of this format in a_bzrdir."""
1935
1735
utf8_files = [('revision-history', ''),
1936
1736
('branch-name', ''),
1938
return self._initialize_helper(a_bzrdir, utf8_files, name=name,
1738
return self._initialize_helper(a_bzrdir, utf8_files,
1939
1739
lock_type='branch4', set_format=False)
1941
1741
def __init__(self):
1976
1775
return self.get_format_string()
1978
def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False):
1777
def open(self, a_bzrdir, _found=False, ignore_fallbacks=False):
1979
1778
"""See BranchFormat.open()."""
1981
format = BranchFormat.find_format(a_bzrdir, name=name)
1780
format = BranchFormat.find_format(a_bzrdir)
1982
1781
if format.__class__ != self.__class__:
1983
1782
raise AssertionError("wrong format %r found for %r" %
1984
1783
(format, self))
1985
transport = a_bzrdir.get_branch_transport(None, name=name)
1785
transport = a_bzrdir.get_branch_transport(None)
1987
1786
control_files = lockable_files.LockableFiles(transport, 'lock',
1988
1787
lockdir.LockDir)
1989
1788
return self._branch_class()(_format=self,
1990
1789
_control_files=control_files,
1992
1790
a_bzrdir=a_bzrdir,
1993
1791
_repository=a_bzrdir.find_repository(),
1994
1792
ignore_fallbacks=ignore_fallbacks)
1995
1793
except errors.NoSuchFile:
1996
raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1794
raise errors.NotBranchError(path=transport.base)
1998
1796
def __init__(self):
1999
1797
super(BranchFormatMetadir, self).__init__()
2028
1826
"""See BranchFormat.get_format_description()."""
2029
1827
return "Branch format 5"
2031
def initialize(self, a_bzrdir, name=None):
1829
def initialize(self, a_bzrdir):
2032
1830
"""Create a branch of this format in a_bzrdir."""
2033
1831
utf8_files = [('revision-history', ''),
2034
1832
('branch-name', ''),
2036
return self._initialize_helper(a_bzrdir, utf8_files, name)
1834
return self._initialize_helper(a_bzrdir, utf8_files)
2038
1836
def supports_tags(self):
2061
1859
"""See BranchFormat.get_format_description()."""
2062
1860
return "Branch format 6"
2064
def initialize(self, a_bzrdir, name=None):
1862
def initialize(self, a_bzrdir):
2065
1863
"""Create a branch of this format in a_bzrdir."""
2066
1864
utf8_files = [('last-revision', '0 null:\n'),
2067
1865
('branch.conf', ''),
2070
return self._initialize_helper(a_bzrdir, utf8_files, name)
1868
return self._initialize_helper(a_bzrdir, utf8_files)
2072
1870
def make_tags(self, branch):
2073
1871
"""See bzrlib.branch.BranchFormat.make_tags()."""
2091
1889
"""See BranchFormat.get_format_description()."""
2092
1890
return "Branch format 8"
2094
def initialize(self, a_bzrdir, name=None):
1892
def initialize(self, a_bzrdir):
2095
1893
"""Create a branch of this format in a_bzrdir."""
2096
1894
utf8_files = [('last-revision', '0 null:\n'),
2097
1895
('branch.conf', ''),
2099
1897
('references', '')
2101
return self._initialize_helper(a_bzrdir, utf8_files, name)
1899
return self._initialize_helper(a_bzrdir, utf8_files)
2103
1901
def __init__(self):
2104
1902
super(BzrBranchFormat8, self).__init__()
2127
1925
This format was introduced in bzr 1.6.
2130
def initialize(self, a_bzrdir, name=None):
1928
def initialize(self, a_bzrdir):
2131
1929
"""Create a branch of this format in a_bzrdir."""
2132
1930
utf8_files = [('last-revision', '0 null:\n'),
2133
1931
('branch.conf', ''),
2136
return self._initialize_helper(a_bzrdir, utf8_files, name)
1934
return self._initialize_helper(a_bzrdir, utf8_files)
2138
1936
def _branch_class(self):
2139
1937
return BzrBranch7
2171
1969
"""See BranchFormat.get_format_description()."""
2172
1970
return "Checkout reference format 1"
2174
def get_reference(self, a_bzrdir, name=None):
1972
def get_reference(self, a_bzrdir):
2175
1973
"""See BranchFormat.get_reference()."""
2176
transport = a_bzrdir.get_branch_transport(None, name=name)
1974
transport = a_bzrdir.get_branch_transport(None)
2177
1975
return transport.get_bytes('location')
2179
def set_reference(self, a_bzrdir, name, to_branch):
1977
def set_reference(self, a_bzrdir, to_branch):
2180
1978
"""See BranchFormat.set_reference()."""
2181
transport = a_bzrdir.get_branch_transport(None, name=name)
1979
transport = a_bzrdir.get_branch_transport(None)
2182
1980
location = transport.put_bytes('location', to_branch.base)
2184
def initialize(self, a_bzrdir, name=None, target_branch=None):
1982
def initialize(self, a_bzrdir, target_branch=None):
2185
1983
"""Create a branch of this format in a_bzrdir."""
2186
1984
if target_branch is None:
2187
1985
# this format does not implement branch itself, thus the implicit
2188
1986
# creation contract must see it as uninitializable
2189
1987
raise errors.UninitializableFormat(self)
2190
mutter('creating branch reference in %s', a_bzrdir.user_url)
2191
branch_transport = a_bzrdir.get_branch_transport(self, name=name)
1988
mutter('creating branch reference in %s', a_bzrdir.transport.base)
1989
branch_transport = a_bzrdir.get_branch_transport(self)
2192
1990
branch_transport.put_bytes('location',
2193
target_branch.bzrdir.user_url)
1991
target_branch.bzrdir.root_transport.base)
2194
1992
branch_transport.put_bytes('format', self.get_format_string())
2196
a_bzrdir, name, _found=True,
1994
a_bzrdir, _found=True,
2197
1995
possible_transports=[target_branch.bzrdir.root_transport])
2198
self._run_post_branch_init_hooks(a_bzrdir, name, branch)
2201
1997
def __init__(self):
2202
1998
super(BranchReferenceFormat, self).__init__()
2208
2004
def clone(to_bzrdir, revision_id=None,
2209
2005
repository_policy=None):
2210
2006
"""See Branch.clone()."""
2211
return format.initialize(to_bzrdir, target_branch=a_branch)
2007
return format.initialize(to_bzrdir, a_branch)
2212
2008
# cannot obey revision_id limits when cloning a reference ...
2213
2009
# FIXME RBC 20060210 either nuke revision_id for clone, or
2214
2010
# emit some sort of warning/error to the caller ?!
2217
def open(self, a_bzrdir, name=None, _found=False, location=None,
2013
def open(self, a_bzrdir, _found=False, location=None,
2218
2014
possible_transports=None, ignore_fallbacks=False):
2219
2015
"""Return the branch that the branch reference in a_bzrdir points at.
2221
2017
:param a_bzrdir: A BzrDir that contains a branch.
2222
:param name: Name of colocated branch to open, if any
2223
2018
:param _found: a private parameter, do not use it. It is used to
2224
2019
indicate if format probing has already be done.
2225
2020
:param ignore_fallbacks: when set, no fallback branches will be opened
2230
2025
:param possible_transports: An optional reusable transports list.
2233
format = BranchFormat.find_format(a_bzrdir, name=name)
2028
format = BranchFormat.find_format(a_bzrdir)
2234
2029
if format.__class__ != self.__class__:
2235
2030
raise AssertionError("wrong format %r found for %r" %
2236
2031
(format, self))
2237
2032
if location is None:
2238
location = self.get_reference(a_bzrdir, name)
2033
location = self.get_reference(a_bzrdir)
2239
2034
real_bzrdir = bzrdir.BzrDir.open(
2240
2035
location, possible_transports=possible_transports)
2241
result = real_bzrdir.open_branch(name=name,
2242
ignore_fallbacks=ignore_fallbacks)
2036
result = real_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2243
2037
# this changes the behaviour of result.clone to create a new reference
2244
2038
# rather than a copy of the content of the branch.
2245
2039
# I did not use a proxy object because that needs much more extensive
2279
2073
_legacy_formats[0].network_name(), _legacy_formats[0].__class__)
2282
class BranchWriteLockResult(LogicalLockResult):
2283
"""The result of write locking a branch.
2285
:ivar branch_token: The token obtained from the underlying branch lock, or
2287
:ivar unlock: A callable which will unlock the lock.
2290
def __init__(self, unlock, branch_token):
2291
LogicalLockResult.__init__(self, unlock)
2292
self.branch_token = branch_token
2295
return "BranchWriteLockResult(%s, %s)" % (self.branch_token,
2299
2076
class BzrBranch(Branch, _RelockDebugMixin):
2300
2077
"""A branch stored in the actual filesystem.
2308
2085
:ivar repository: Repository for this branch.
2309
2086
:ivar base: The url of the base directory for this branch; the one
2310
2087
containing the .bzr directory.
2311
:ivar name: Optional colocated branch name as it exists in the control
2315
2090
def __init__(self, _format=None,
2316
_control_files=None, a_bzrdir=None, name=None,
2317
_repository=None, ignore_fallbacks=False):
2091
_control_files=None, a_bzrdir=None, _repository=None,
2092
ignore_fallbacks=False):
2318
2093
"""Create new branch object at a particular location."""
2319
2094
if a_bzrdir is None:
2320
2095
raise ValueError('a_bzrdir must be supplied')
2322
2097
self.bzrdir = a_bzrdir
2323
2098
self._base = self.bzrdir.transport.clone('..').base
2325
2099
# XXX: We should be able to just do
2326
2100
# self.base = self.bzrdir.root_transport.base
2327
2101
# but this does not quite work yet -- mbp 20080522
2355
2125
return self.control_files.is_locked()
2357
2127
def lock_write(self, token=None):
2358
"""Lock the branch for write operations.
2360
:param token: A token to permit reacquiring a previously held and
2362
:return: A BranchWriteLockResult.
2364
2128
if not self.is_locked():
2365
2129
self._note_lock('w')
2366
2130
# All-in-one needs to always unlock/lock.
2367
2131
repo_control = getattr(self.repository, 'control_files', None)
2368
2132
if self.control_files == repo_control or not self.is_locked():
2369
self.repository._warn_if_deprecated(self)
2370
2133
self.repository.lock_write()
2371
2134
took_lock = True
2373
2136
took_lock = False
2375
return BranchWriteLockResult(self.unlock,
2376
self.control_files.lock_write(token=token))
2138
return self.control_files.lock_write(token=token)
2379
2141
self.repository.unlock()
2382
2144
def lock_read(self):
2383
"""Lock the branch for read operations.
2385
:return: A bzrlib.lock.LogicalLockResult.
2387
2145
if not self.is_locked():
2388
2146
self._note_lock('r')
2389
2147
# All-in-one needs to always unlock/lock.
2390
2148
repo_control = getattr(self.repository, 'control_files', None)
2391
2149
if self.control_files == repo_control or not self.is_locked():
2392
self.repository._warn_if_deprecated(self)
2393
2150
self.repository.lock_read()
2394
2151
took_lock = True
2396
2153
took_lock = False
2398
2155
self.control_files.lock_read()
2399
return LogicalLockResult(self.unlock)
2402
2158
self.repository.unlock()
added
removed
bzrlib/branch.py
