Rev 3429: Merge in bzr-1.5 in http://bzr.arbash-meinel.com/branches/bzr/jam-integration
John Arbash Meinel
john at arbash-meinel.com
Fri May 16 22:01:12 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/jam-integration
------------------------------------------------------------
revno: 3429
revision-id: john at arbash-meinel.com-20080516210025-42cfvhivu30yq32k
parent: john at arbash-meinel.com-20080516205844-qw3v9rr2znofj4n6
parent: pqm at pqm.ubuntu.com-20080516195138-isg4n1lil96in524
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-05-16 16:00:25 -0500
message:
Merge in bzr-1.5
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
------------------------------------------------------------
revno: 3418.6.5
tags: bzr-1.5
revision-id: pqm at pqm.ubuntu.com-20080516195138-isg4n1lil96in524
parent: pqm at pqm.ubuntu.com-20080516180911-jm273stya26f1rxj
parent: john at arbash-meinel.com-20080516170831-1yvp8g9gnjw24rcr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.5
timestamp: Fri 2008-05-16 20:51:38 +0100
message:
(jam) bzr-1.5final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
------------------------------------------------------------
revno: 3418.7.3
revision-id: john at arbash-meinel.com-20080516170831-1yvp8g9gnjw24rcr
parent: john at arbash-meinel.com-20080516165444-p55ebidnm1oc469p
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.5-final
timestamp: Fri 2008-05-16 12:08:31 -0500
message:
NEWS and version string updates for 1.5-final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3418.7.2
revision-id: john at arbash-meinel.com-20080516165444-p55ebidnm1oc469p
parent: john at arbash-meinel.com-20080516164503-y3ebewxs2gsypbtr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-05-16 11:54:44 -0500
message:
Cherrypick the deprecation suppression for 1.5
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
------------------------------------------------------------
revno: 3418.6.4
revision-id: pqm at pqm.ubuntu.com-20080516180911-jm273stya26f1rxj
parent: pqm at pqm.ubuntu.com-20080510010654-pgstnjcvu71q7cxo
parent: john at arbash-meinel.com-20080516164503-y3ebewxs2gsypbtr
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.5
timestamp: Fri 2008-05-16 19:09:11 +0100
message:
(igc) Updates to the user guide
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
doc/en/user-guide/web_browsing.txt web_browsing.txt-20080509065016-cjc90f46407vi9a0-3
------------------------------------------------------------
revno: 3418.7.1
revision-id: john at arbash-meinel.com-20080516164503-y3ebewxs2gsypbtr
parent: pqm at pqm.ubuntu.com-20080510010654-pgstnjcvu71q7cxo
author: Ian Clatworthy <ian.clatworthy at canonical.com>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-05-16 11:45:03 -0500
message:
Cherry pick Ian's changes to the user guide into 1.5
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
doc/en/user-guide/bzrtools_plugin.txt bzrtools_plugin.txt-20080509065016-cjc90f46407vi9a0-1
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
doc/en/user-guide/web_browsing.txt web_browsing.txt-20080509065016-cjc90f46407vi9a0-3
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2008-05-16 20:58:44 +0000
+++ b/NEWS 2008-05-16 21:00:25 +0000
@@ -44,6 +44,26 @@
(Robert Collins)
+bzr 1.5 2008-05-16
+------------------
+
+This release of Bazaar includes several updates to the documentation, and fixes
+to prepare for making rich root support the default format. Many bugs have been
+squashed, including fixes to log, bzr+ssh inter-operation with older servers.
+
+ CHANGES:
+
+ * Suppress deprecation warnings when bzrlib is a 'final' release. This way
+ users of packaged software won't be bothered with DeprecationWarnings,
+ but developers and testers will still see them. (John Arbash Meinel)
+
+ DOCUMENTATION:
+
+ * Incorporate feedback from Jelmer Vernooij and Neil Martinsen-Burrell
+ on the plugin and integration chapters of the User Guide.
+ (Ian Clatworthy)
+
+
bzr 1.5rc1 2008-05-09
---------------------
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py 2008-05-08 04:21:01 +0000
+++ b/bzrlib/commands.py 2008-05-16 16:54:44 +0000
@@ -824,6 +824,11 @@
import bzrlib.ui
from bzrlib.ui.text import TextUIFactory
bzrlib.ui.ui_factory = TextUIFactory()
+
+ # Is this a final release version? If so, we should suppress warnings
+ if bzrlib.version_info[3] == 'final':
+ from bzrlib import symbol_versioning
+ symbol_versioning.suppress_deprecation_warnings()
try:
argv = [a.decode(bzrlib.user_encoding) for a in argv[1:]]
except UnicodeDecodeError:
=== modified file 'bzrlib/symbol_versioning.py'
--- a/bzrlib/symbol_versioning.py 2008-05-11 23:49:50 +0000
+++ b/bzrlib/symbol_versioning.py 2008-05-16 21:00:25 +0000
@@ -331,3 +331,29 @@
return self._warn_deprecated(list.pop)
return _DeprecatedList(initial_value)
+
+
+def suppress_deprecation_warnings():
+ """Call this function to suppress all deprecation warnings.
+
+ When this is a final release version, we don't want to annoy users with
+ lots of deprecation warnings. We only want the deprecation warnings when
+ running a dev or release candidate.
+ """
+ import warnings
+ warnings.filterwarnings('ignore', category=DeprecationWarning)
+
+
+def activate_deprecation_warnings():
+ """Call this function to activate deprecation warnings.
+
+ When running in a 'final' release we suppress deprecation warnings.
+ However, the test suite wants to see them. So when running selftest, we
+ re-enable the deprecation warnings.
+
+ Note: warnings that have already been issued under 'ignore' will not be
+ reported after this point. The 'warnings' module has already marked them as
+ handled, so they don't get issued again.
+ """
+ import warnings
+ warnings.filterwarnings('default', category=DeprecationWarning)
More information about the bazaar-commits
mailing list