Rev 5661: (jameinel) Bug #835035, if a fallback repository is incompatible, in file:///home/pqm/archives/thelove/bzr/2.3/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Aug 29 18:10:41 UTC 2011
At file:///home/pqm/archives/thelove/bzr/2.3/
------------------------------------------------------------
revno: 5661 [merge]
revision-id: pqm at pqm.ubuntu.com-20110829181038-21uvn1yzqzf38kws
parent: pqm at pqm.ubuntu.com-20110820123150-epmi6cndc5lcv8ab
parent: john at arbash-meinel.com-20110829172405-2irumem9il2jwrx7
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.3
timestamp: Mon 2011-08-29 18:10:38 +0000
message:
(jameinel) Bug #835035, if a fallback repository is incompatible,
don't leave it locked. (Gary Poster)
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/per_repository_reference/__init__.py __init__.py-20080220025549-nnm2s80it1lvcwnc-2
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2011-02-28 23:07:53 +0000
+++ b/bzrlib/remote.py 2011-08-27 02:14:12 +0000
@@ -1250,12 +1250,13 @@
# We need to accumulate additional repositories here, to pass them in
# on various RPC's.
#
+ # Make the check before we lock: this raises an exception.
+ self._check_fallback_repository(repository)
if self.is_locked():
# We will call fallback.unlock() when we transition to the unlocked
# state, so always add a lock here. If a caller passes us a locked
# repository, they are responsible for unlocking it later.
repository.lock_read()
- self._check_fallback_repository(repository)
self._fallback_repositories.append(repository)
# If self._real_repository was parameterised already (e.g. because a
# _real_branch had its get_stacked_on_url method called), then the
=== modified file 'bzrlib/repository.py'
--- a/bzrlib/repository.py 2011-01-13 00:41:19 +0000
+++ b/bzrlib/repository.py 2011-08-27 02:14:12 +0000
@@ -1046,11 +1046,12 @@
"""
if not self._format.supports_external_lookups:
raise errors.UnstackableRepositoryFormat(self._format, self.base)
+ # Make the check before we lock: this raises an exception.
+ self._check_fallback_repository(repository)
if self.is_locked():
# This repository will call fallback.unlock() when we transition to
# the unlocked state, so we make sure to increment the lock count
repository.lock_read()
- self._check_fallback_repository(repository)
self._fallback_repositories.append(repository)
self.texts.add_fallback_versioned_files(repository.texts)
self.inventories.add_fallback_versioned_files(repository.inventories)
=== modified file 'bzrlib/tests/per_repository_reference/__init__.py'
--- a/bzrlib/tests/per_repository_reference/__init__.py 2011-02-09 06:35:00 +0000
+++ b/bzrlib/tests/per_repository_reference/__init__.py 2011-08-29 17:24:05 +0000
@@ -66,18 +66,37 @@
class TestIncompatibleStacking(TestCaseWithRepository):
- def test_add_fallback_repository_rejects_incompatible(self):
- # Repository.add_fallback_repository raises IncompatibleRepositories if
- # you take two repositories in different serializations and try to
- # stack them.
- if self.make_repository('test')._format.supports_chks:
+ def make_repo_and_incompatible_fallback(self):
+ referring = self.make_repository('referring')
+ if referring._format.supports_chks:
different_fmt = '1.9'
else:
different_fmt = '2a'
- repo = self.make_repository('repo', format=different_fmt)
- referring = self.make_repository('referring')
- self.assertRaises(errors.IncompatibleRepositories,
- referring.add_fallback_repository, repo)
+ fallback = self.make_repository('fallback', format=different_fmt)
+ return referring, fallback
+
+ def test_add_fallback_repository_rejects_incompatible(self):
+ # Repository.add_fallback_repository raises IncompatibleRepositories
+ # if you take two repositories in different serializations and try to
+ # stack them.
+ referring, fallback = self.make_repo_and_incompatible_fallback()
+ self.assertRaises(errors.IncompatibleRepositories,
+ referring.add_fallback_repository, fallback)
+
+ def test_add_fallback_doesnt_leave_fallback_locked(self):
+ # Bug #835035. If the referring repository is locked, it wants to lock
+ # the fallback repository. But if they are incompatible, the referring
+ # repository won't take ownership of the fallback, and thus should not
+ # leave the repository in a locked state.
+ referring, fallback = self.make_repo_and_incompatible_fallback()
+ self.addCleanup(referring.lock_read().unlock)
+ # Assert precondition.
+ self.assertFalse(fallback.is_locked())
+ # Assert action.
+ self.assertRaises(errors.IncompatibleRepositories,
+ referring.add_fallback_repository, fallback)
+ # Assert postcondition.
+ self.assertFalse(fallback.is_locked())
def external_reference_test_scenarios():
More information about the bazaar-commits
mailing list