Rev 2693: (mbp) rename 0.19 release to 0.90 in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Fri Aug 10 08:12:34 BST 2007
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 2693
revision-id: pqm at pqm.ubuntu.com-20070810071232-0ndzwbob5juuzaus
parent: pqm at pqm.ubuntu.com-20070810055236-5viugoz9x2besqh3
parent: mbp at sourcefrog.net-20070809033931-s6dr6q38rs82ni5i
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-08-10 08:12:32 +0100
message:
(mbp) rename 0.19 release to 0.90
modified:
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2687.2.2
merged: mbp at sourcefrog.net-20070809033931-s6dr6q38rs82ni5i
parent: mbp at sourcefrog.net-20070809032304-r2nzqvfgqt36jkko
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: rename-0.19
timestamp: Thu 2007-08-09 13:39:31 +1000
message:
Fix up other references to 0.19
------------------------------------------------------------
revno: 2687.2.1
merged: mbp at sourcefrog.net-20070809032304-r2nzqvfgqt36jkko
parent: pqm at pqm.ubuntu.com-20070809000503-7gad4qd85xll5ucf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: rename-0.19
timestamp: Thu 2007-08-09 13:23:04 +1000
message:
Rename upcoming release from 0.19 to 0.90
=== modified file 'bzr'
--- a/bzr 2007-07-10 01:37:27 +0000
+++ b/bzr 2007-08-09 03:23:04 +0000
@@ -88,7 +88,7 @@
import bzrlib.commands
import bzrlib.trace
-if bzrlib.version_info[:3] != (0, 19, 0):
+if bzrlib.version_info[:3] != (0, 90, 0):
sys.stderr.write("bzr: WARNING: bzrlib version doesn't match the bzr program.\n"
"This may indicate an installation problem.\n"
"bzrlib from %s is version %r\n"
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2007-07-10 01:37:27 +0000
+++ b/bzrlib/__init__.py 2007-08-09 03:23:04 +0000
@@ -35,7 +35,7 @@
# Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
# releaselevel of 'dev' for unreleased under-development code.
-version_info = (0, 19, 0, 'dev', 0)
+version_info = (0, 90, 0, 'dev', 0)
# API compatibility version: bzrlib is currently API compatible with 0.18.
api_minimum_version = (0, 18, 0)
=== modified file 'bzrlib/merge_directive.py'
--- a/bzrlib/merge_directive.py 2007-07-20 14:28:59 +0000
+++ b/bzrlib/merge_directive.py 2007-08-09 03:39:31 +0000
@@ -325,7 +325,7 @@
class MergeDirective2(_BaseMergeDirective):
- _format_string = 'Bazaar merge directive format 2 (Bazaar 0.19)'
+ _format_string = 'Bazaar merge directive format 2 (Bazaar 0.90)'
def __init__(self, revision_id, testament_sha1, time, timezone,
target_branch, patch=None, source_branch=None, message=None,
=== modified file 'bzrlib/revision.py'
--- a/bzrlib/revision.py 2007-07-11 19:04:11 +0000
+++ b/bzrlib/revision.py 2007-08-09 03:39:31 +0000
@@ -500,6 +500,6 @@
def is_null(revision_id):
if revision_id is None:
symbol_versioning.warn('NULL_REVISION should be used for the null'
- ' revision instead of None, as of bzr 0.19.',
+ ' revision instead of None, as of bzr 0.90.',
DeprecationWarning, stacklevel=2)
return revision_id in (None, NULL_REVISION)
=== modified file 'bzrlib/revisiontree.py'
--- a/bzrlib/revisiontree.py 2007-07-17 20:04:13 +0000
+++ b/bzrlib/revisiontree.py 2007-08-09 03:23:04 +0000
@@ -62,7 +62,7 @@
"""Return the revision id associated with this tree."""
return self._revision_id
- @symbol_versioning.deprecated_method(symbol_versioning.zero_nineteen)
+ @symbol_versioning.deprecated_method(symbol_versioning.zero_ninety)
def get_weave(self, file_id):
return self._get_weave(file_id)
=== modified file 'bzrlib/symbol_versioning.py'
--- a/bzrlib/symbol_versioning.py 2007-07-10 01:37:27 +0000
+++ b/bzrlib/symbol_versioning.py 2007-08-09 03:39:31 +0000
@@ -37,7 +37,7 @@
'zero_sixteen',
'zero_seventeen',
'zero_eighteen',
- 'zero_nineteen',
+ 'zero_ninety',
]
from warnings import warn
@@ -56,7 +56,7 @@
zero_sixteen = "%s was deprecated in version 0.16."
zero_seventeen = "%s was deprecated in version 0.17."
zero_eighteen = "%s was deprecated in version 0.18."
-zero_nineteen = "%s was deprecated in version 0.19."
+zero_ninety = "%s was deprecated in version 0.90."
def set_warning_method(method):
=== modified file 'bzrlib/tests/blackbox/test_merge_directive.py'
--- a/bzrlib/tests/blackbox/test_merge_directive.py 2007-07-20 14:28:59 +0000
+++ b/bzrlib/tests/blackbox/test_merge_directive.py 2007-08-09 03:39:31 +0000
@@ -30,7 +30,7 @@
To: pqm at example.com
User-Agent: Bazaar \(.*\)
-# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
+# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
# revision_id: bar-id
# target_branch: ../tree2
# testament_sha1: .*
=== modified file 'bzrlib/tests/test_merge_directive.py'
--- a/bzrlib/tests/test_merge_directive.py 2007-07-20 14:28:59 +0000
+++ b/bzrlib/tests/test_merge_directive.py 2007-08-09 03:39:31 +0000
@@ -31,7 +31,7 @@
#\x20
booga"""
-OUTPUT1_2 = """# Bazaar merge directive format 2 (Bazaar 0.19)
+OUTPUT1_2 = """# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: example:
# target_branch: http://example.com
# testament_sha1: sha
@@ -51,7 +51,7 @@
#\x20
booga"""
-OUTPUT2_2 = """# Bazaar merge directive format 2 (Bazaar 0.19)
+OUTPUT2_2 = """# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: example:
# target_branch: http://example.com
# testament_sha1: sha
@@ -96,7 +96,7 @@
Aaron
-# Bazaar merge directive format 2 (Bazaar 0.19)\r
+# Bazaar merge directive format 2 (Bazaar 0.90)\r
# revision_id: example:
# target_branch: http://example.com
# testament_sha1: sha
@@ -270,7 +270,7 @@
To: pqm at example.com
User-Agent: Bazaar \(.*\)
-# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
+# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
# revision_id: rev2a
# target_branch: (.|\n)*
# testament_sha1: .*
@@ -298,7 +298,7 @@
To: pqm at example.com
User-Agent: Bazaar \(.*\)
-# Bazaar merge directive format 2 \\(Bazaar 0.19\\)
+# Bazaar merge directive format 2 \\(Bazaar 0.90\\)
# revision_id: rev2a
# target_branch: (.|\n)*
# testament_sha1: .*
=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py 2007-07-20 05:06:32 +0000
+++ b/bzrlib/tests/test_transform.py 2007-08-09 03:39:31 +0000
@@ -944,7 +944,7 @@
transform.finalize()
def test_change_entry(self):
- txt = 'bzrlib.transform.change_entry was deprecated in version 0.19.'
+ txt = 'bzrlib.transform.change_entry was deprecated in version 0.90.'
self.callDeprecated([txt], change_entry, None, None, None, None, None,
None, None, None)
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2007-07-20 05:06:32 +0000
+++ b/bzrlib/transform.py 2007-08-09 03:23:04 +0000
@@ -34,8 +34,11 @@
from bzrlib.osutils import (file_kind, supports_executable, pathjoin, lexists,
delete_any)
from bzrlib.progress import DummyProgress, ProgressPhase
-from bzrlib.symbol_versioning import deprecated_function, zero_fifteen, \
- zero_nineteen
+from bzrlib.symbol_versioning import (
+ deprecated_function,
+ zero_fifteen,
+ zero_ninety,
+ )
from bzrlib.trace import mutter, warning
from bzrlib import tree
import bzrlib.ui
@@ -1425,7 +1428,7 @@
working_tree.unlock()
- at deprecated_function(zero_nineteen)
+ at deprecated_function(zero_ninety)
def change_entry(tt, file_id, working_tree, target_tree,
trans_id_file_id, backups, trans_id, by_parent):
"""Replace a file_id's contents with those from a target tree."""
=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py 2007-07-22 17:18:05 +0000
+++ b/bzrlib/transport/__init__.py 2007-08-09 03:23:04 +0000
@@ -56,7 +56,7 @@
DEPRECATED_PARAMETER,
zero_eight,
zero_eleven,
- zero_nineteen,
+ zero_ninety,
)
from bzrlib.trace import (
note,
@@ -179,7 +179,7 @@
- at deprecated_function(zero_nineteen)
+ at deprecated_function(zero_ninety)
def split_url(url):
# TODO: jam 20060606 urls should only be ascii, or they should raise InvalidURL
if isinstance(url, unicode):
@@ -1389,10 +1389,12 @@
return transport
- at deprecated_function(zero_nineteen)
+ at deprecated_function(zero_ninety)
def urlescape(relpath):
urlutils.escape(relpath)
- at deprecated_function(zero_nineteen)
+
+
+ at deprecated_function(zero_ninety)
def urlunescape(url):
urlutils.unescape(url)
=== modified file 'bzrlib/transport/sftp.py'
--- a/bzrlib/transport/sftp.py 2007-07-20 18:59:29 +0000
+++ b/bzrlib/transport/sftp.py 2007-08-09 03:23:04 +0000
@@ -49,7 +49,7 @@
from bzrlib.osutils import pathjoin, fancy_rename, getcwd
from bzrlib.symbol_versioning import (
deprecated_function,
- zero_nineteen,
+ zero_ninety,
)
from bzrlib.trace import mutter, warning
from bzrlib.transport import (
@@ -80,7 +80,7 @@
_default_do_prefetch = (_paramiko_version >= (1, 5, 5))
- at deprecated_function(zero_nineteen)
+ at deprecated_function(zero_ninety)
def clear_connection_cache():
"""Remove all hosts from the SFTP connection cache.
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2007-08-01 18:23:29 +0000
+++ b/bzrlib/workingtree_4.py 2007-08-09 03:23:04 +0000
@@ -1497,7 +1497,7 @@
return parent_details[1]
return None
- @symbol_versioning.deprecated_method(symbol_versioning.zero_nineteen)
+ @symbol_versioning.deprecated_method(symbol_versioning.zero_ninety)
def get_weave(self, file_id):
return self._get_weave(file_id)
More information about the bazaar-commits
mailing list