Rev 2192: Merge bzr.dev. in http://bazaar.launchpad.net/~bzr/bzr/hpss
Robert Collins
robertc at robertcollins.net
Thu Mar 29 06:10:40 BST 2007
At http://bazaar.launchpad.net/~bzr/bzr/hpss
------------------------------------------------------------
revno: 2192
revision-id: robertc at robertcollins.net-20070329050914-srdhcaubqro5awjs
parent: robertc at robertcollins.net-20070329050040-mihvse1hk4mu7mxk
parent: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss
timestamp: Thu 2007-03-29 15:09:14 +1000
message:
Merge bzr.dev.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.2
merged: pqm at pqm.ubuntu.com-20070329043540-952aff23533c1c26
parent: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
parent: robertc at robertcollins.net-20070329014154-2syh5qahvcokiq3p
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 05:35:40 +0100
message:
(robertc) Various test suite changes and cleanups in preparation for the next hpss branch. (Robert Collins, Andrew Bennetts)
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.6
merged: robertc at robertcollins.net-20070329014154-2syh5qahvcokiq3p
parent: robertc at robertcollins.net-20070328223141-sfyiqllwuimpvj06
committer: Robert Collins <robertc at robertcollins.net>
branch nick: hpss-test-correctness
timestamp: Thu 2007-03-29 11:41:54 +1000
message:
Unbreak lockdir tests after adding fast lockdir timeouts to the test suite default environment.
------------------------------------------------------------
revno: 2018.1.2.1.50.2.80.1.99.1.9.1.21.1.26.2.74.2.2.2.1
merged: pqm at pqm.ubuntu.com-20070329014424-0947dae124353e1f
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
parent: aaron.bentley at utoronto.ca-20070328232821-x42jbaadrfstx5xe
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-29 02:44:24 +0100
message:
deprecate Branch.get_root_id
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.7
merged: aaron.bentley at utoronto.ca-20070328232821-x42jbaadrfstx5xe
parent: aaron.bentley at utoronto.ca-20070328232201-68j4rmrzd4saaenf
parent: pqm at pqm.ubuntu.com-20070328065822-999550a858a3ced3
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-28 19:28:21 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.6
merged: aaron.bentley at utoronto.ca-20070328232201-68j4rmrzd4saaenf
parent: abentley at panoramicfeedback.com-20070327132624-4v0gvw2iraaov6su
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-28 19:22:01 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.5
merged: abentley at panoramicfeedback.com-20070327132624-4v0gvw2iraaov6su
parent: abentley at panoramicfeedback.com-20070327132355-pw9rf1lt8bp1aprk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-27 09:26:24 -0400
message:
Deprecate Branch.get_root_id
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.4
merged: abentley at panoramicfeedback.com-20070327132355-pw9rf1lt8bp1aprk
parent: aaron.bentley at utoronto.ca-20070319070804-om44daawwxu6vi5c
parent: pqm at pqm.ubuntu.com-20070326073003-37941d0fa5a5a6c4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-27 09:23:55 -0400
message:
Merge bzr.dev
=== modified file 'NEWS'
--- a/NEWS 2007-03-29 02:38:48 +0000
+++ b/NEWS 2007-03-29 05:09:14 +0000
@@ -11,6 +11,9 @@
requires an explicit action using a ChrootServer.
(Robert Collins, Andrew Bennetts)
+ * Deprecate Branch.get_root_id() because branches don't have root ids,
+ rather than fixing bug #96847. (Aaron Bentley)
+
* ``LockableFiles.lock_write()`` now accepts a ``token`` keyword argument,
so that a seperate LockableFiles instance can share a lock if it has the
right token. (Andrew Bennetts, Robert Collins)
=== modified file 'bzrlib/branch.py'
--- a/bzrlib/branch.py 2007-03-29 04:08:16 +0000
+++ b/bzrlib/branch.py 2007-03-29 05:09:14 +0000
@@ -58,7 +58,7 @@
deprecated_method,
DEPRECATED_PARAMETER,
deprecated_passed,
- zero_eight, zero_nine,
+ zero_eight, zero_nine, zero_sixteen,
)
from bzrlib.trace import mutter, note
@@ -313,8 +313,13 @@
raise InvalidRevisionNumber(revno)
return self.repository.get_revision_delta(rh[revno-1])
+ @deprecated_method(zero_sixteen)
def get_root_id(self):
- """Return the id of this branches root"""
+ """Return the id of this branches root
+
+ Deprecated: branches don't have root ids-- trees do.
+ Use basis_tree().get_root_id() instead.
+ """
raise NotImplementedError(self.get_root_id)
def print_file(self, file, revision_id):
@@ -1261,6 +1266,8 @@
"""See Branch.abspath."""
return self.control_files._transport.abspath(name)
+
+ @deprecated_method(zero_sixteen)
@needs_read_lock
def get_root_id(self):
"""See Branch.get_root_id."""
=== modified file 'bzrlib/symbol_versioning.py'
--- a/bzrlib/symbol_versioning.py 2007-01-16 15:56:53 +0000
+++ b/bzrlib/symbol_versioning.py 2007-03-27 13:26:24 +0000
@@ -34,6 +34,7 @@
'zero_thirteen',
'zero_fourteen',
'zero_fifteen',
+ 'zero_sixteen',
]
from warnings import warn
@@ -49,6 +50,7 @@
zero_thirteen = "%s was deprecated in version 0.13."
zero_fourteen = "%s was deprecated in version 0.14."
zero_fifteen = "%s was deprecated in version 0.15."
+zero_sixteen = "%s was deprecated in version 0.16."
def set_warning_method(method):
=== modified file 'bzrlib/tests/test_lockdir.py'
--- a/bzrlib/tests/test_lockdir.py 2007-02-01 14:59:04 +0000
+++ b/bzrlib/tests/test_lockdir.py 2007-03-29 01:41:54 +0000
@@ -33,7 +33,7 @@
LockContention, LockError, UnlockableTransport,
LockNotHeld, LockBroken
)
-from bzrlib.lockdir import LockDir, _DEFAULT_TIMEOUT_SECONDS
+from bzrlib.lockdir import LockDir
from bzrlib.tests import TestCaseWithTransport
from bzrlib.trace import note
@@ -286,6 +286,9 @@
def test_34_lock_write_waits(self):
"""LockDir.lock_write() will wait for the lock."""
+ # the test suite sets the default to 0 to make deadlocks fail fast.
+ # change it for this test, as we want to try a manual deadlock.
+ bzrlib.lockdir._DEFAULT_TIMEOUT_SECONDS = 300
t = self.get_transport()
lf1 = LockDir(t, 'test_lock')
lf1.create()
More information about the bazaar-commits
mailing list