Rev 3430: (jam) Merge bzr-1.5 back into trunk in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Sat May 17 01:41:48 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3430
revision-id:pqm at pqm.ubuntu.com-20080517004133-6476aqcg9uf8zn0c
parent: pqm at pqm.ubuntu.com-20080516221628-r3muhnav5c87z2nm
parent: john at arbash-meinel.com-20080516210025-42cfvhivu30yq32k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-05-17 01:41:33 +0100
message:
(jam) Merge bzr-1.5 back into trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
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: 3427.1.2
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
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.6.3.1.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.6.3.1.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.6.3.1.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
------------------------------------------------------------
revno: 3427.1.1
revision-id:john at arbash-meinel.com-20080516205844-qw3v9rr2znofj4n6
parent: pqm at pqm.ubuntu.com-20080512115743-6uz3lnmrrbhmoiqe
parent: ian.clatworthy at canonical.com-20080515235843-6u65zf4rc0i81hsj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-05-16 15:58:44 -0500
message:
merge in official history of updates to 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: 3423.1.4
revision-id:ian.clatworthy at canonical.com-20080515235843-6u65zf4rc0i81hsj
parent: ian.clatworthy at canonical.com-20080512123827-fte8yi6s32jppcrw
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.ug-15-fixes
timestamp: Fri 2008-05-16 09:58:43 +1000
message:
move Miscellaneous topics chapter above the plugin one
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/part2_intro.txt best_practice_intro.-20071123154453-dk2mjhrg1vpjm5w2-1
------------------------------------------------------------
revno: 3423.1.3
revision-id:ian.clatworthy at canonical.com-20080512123827-fte8yi6s32jppcrw
parent: ian.clatworthy at canonical.com-20080512120952-py46s4m1lunzhyrc
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.ug-15-fixes
timestamp: Mon 2008-05-12 22:38:27 +1000
message:
incorporate feedback from Neil Martinsen-Burrell
modified:
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/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: 3423.1.2
revision-id:ian.clatworthy at canonical.com-20080512120952-py46s4m1lunzhyrc
parent: ian.clatworthy at canonical.com-20080512025125-cc1bl0wdlcdpxydv
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.ug-15-fixes
timestamp: Mon 2008-05-12 22:09:52 +1000
message:
add svn-import example
modified:
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
------------------------------------------------------------
revno: 3423.1.1
revision-id:ian.clatworthy at canonical.com-20080512025125-cc1bl0wdlcdpxydv
parent: pqm at pqm.ubuntu.com-20080510134309-4y3tppe4u5fdw13z
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: bzr.ug-15-fixes
timestamp: Mon 2008-05-12 12:51:25 +1000
message:
fixes to bzr-svn doc suggested by jelmer on #bzr
modified:
doc/en/user-guide/svn_plugin.txt svn_plugin.txt-20080509065016-cjc90f46407vi9a0-2
=== modified file 'NEWS'
--- a/NEWS 2008-05-16 18:44:44 +0000
+++ b/NEWS 2008-05-17 00:41:33 +0000
@@ -34,6 +34,10 @@
DOCUMENTATION:
+ * Incorporate feedback from Jelmer Vernooij and Neil Martinsen-Burrell
+ on the plugin and integration chapters of the User Guide.
+ (Ian Clatworthy)
+
TESTING:
* New helper function for splitting test suites
@@ -54,6 +58,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)
=== modified file 'doc/en/user-guide/bug_trackers.txt'
--- a/doc/en/user-guide/bug_trackers.txt 2008-05-09 06:52:35 +0000
+++ b/doc/en/user-guide/bug_trackers.txt 2008-05-16 21:00:25 +0000
@@ -17,8 +17,8 @@
This records metadata in Bazaar linking the commit with bug 12345 in
Launchpad. If you use a different bug tracker, it can be given its own
tracker code (instead of ``lp``) and used instead. For details on how
-to configure this, refer to `Bug Tracker Settings`_ in the Bazaar
-User Reference.
+to configure this for Bugzilla, Trac, Roundup and other bug/issue trackers,
+refer to `Bug Tracker Settings`_ in the Bazaar User Reference.
.. _Bug Tracker Settings: ../user-reference/bzr_man.html#bug-tracker-settings
=== modified file 'doc/en/user-guide/bzrtools_plugin.txt'
--- a/doc/en/user-guide/bzrtools_plugin.txt 2008-05-09 06:52:35 +0000
+++ b/doc/en/user-guide/bzrtools_plugin.txt 2008-05-16 21:00:25 +0000
@@ -5,6 +5,8 @@
--------
BzrTools is a collection of useful enhancements to Bazaar.
+For installation instructions, see the BzrTools home page:
+http://bazaar-vcs.org/BzrTools.
Here is a sample of the frequently used commands it provides.
=== modified file 'doc/en/user-guide/index.txt'
--- a/doc/en/user-guide/index.txt 2008-05-09 06:52:35 +0000
+++ b/doc/en/user-guide/index.txt 2008-05-16 21:00:25 +0000
@@ -76,10 +76,19 @@
.. include:: sending_changes.txt
+Miscellaneous topics
+####################
+
+.. include:: part2_intro.txt
+.. include:: adv_merging.txt
+.. include:: server.txt
+.. include:: hooks.txt
+.. include:: version_info.txt
+
+
A brief tour of some popular plugins
####################################
-.. include:: part2_intro.txt
.. include:: bzrtools_plugin.txt
.. include:: svn_plugin.txt
.. include later looms_plugin.txt
@@ -96,15 +105,6 @@
.. include:: bug_trackers.txt
-Miscellaneous topics
-####################
-
-.. include:: adv_merging.txt
-.. include:: server.txt
-.. include:: hooks.txt
-.. include:: version_info.txt
-
-
Appendices
##########
=== modified file 'doc/en/user-guide/part2_intro.txt'
--- a/doc/en/user-guide/part2_intro.txt 2008-05-09 06:52:35 +0000
+++ b/doc/en/user-guide/part2_intro.txt 2008-05-16 21:00:25 +0000
@@ -8,8 +8,7 @@
good to try the procedures covered already for a while,
coming back to this manual once you have mastered them.
-This chapter briefly introduces some of the more popular plugins
-and explains why you may wish to use them. Remaining chapters
+Remaining chapters
covers various topics to guide you in further optimizing how you
use Bazaar. Unless stated otherwise, the topics in this and
remaining chapters are independent of each other and can therefore
=== modified file 'doc/en/user-guide/svn_plugin.txt'
--- a/doc/en/user-guide/svn_plugin.txt 2008-05-09 06:52:35 +0000
+++ b/doc/en/user-guide/svn_plugin.txt 2008-05-16 21:00:25 +0000
@@ -19,6 +19,9 @@
this is a common interim step for teams looking to adopt Bazaar but
who are unable to do so yet for timing or non-technical reasons.
+For installation instructions, see the bzr-svn home page:
+http://bazaar-vcs.org/BzrForeignBranches/Subversion.
+
A simple example
----------------
@@ -62,13 +65,17 @@
to import the Subversion repository into a Bazaar one once and for all
for your project, and then branch from that native Bazaar repository
instead. bzr-svn provides the ``svn-import`` command for doing this
-repository-to-repository conversion. See ``bzr help svn-import`` for details.
+repository-to-repository conversion. Here's an example of how to use it::
+
+ bzr init-repo --rich-root-pack beagle.bzr
+ cd beagle.bzr
+ bzr svn-import svn+ssh://svn.gnome.org/svn/beagle
Here's the recipe from above updated to use a central Bazaar mirror::
bzr init-repo --rich-root-pack beagle-repo
cd beagle-repo
- bzr branch bzr+ssh://bzr.gnome.org/bzr/beagle/trunk beagle-trunk
+ bzr branch bzr+ssh://bzr.gnome.org/beagle.bzr/trunk beagle-trunk
bzr branch beagle-trunk beagle-feature1
cd beagle-feature1
*changes*
@@ -79,13 +86,13 @@
bzr pull
bzr merge ../beagle-feature1
bzr commit -m "Complete comment for SVN commit"
- bzr svn-push
+ bzr push
In this case, committing to the trunk only commits the merge locally.
To commit back to the master Subversion trunk, an additional command
-(``bzr svn-push``) is required.
+(``bzr push``) is required.
-Note: You'll need to give ``pull and ``svn-push`` the relevant URLs
+Note: You'll need to give ``pull and ``push`` the relevant URLs
the first time you use those commands in the trunk branch. After that,
bzr remembers them.
@@ -100,11 +107,16 @@
Bazaar and Subversion are different tools with different capabilities
so there will always be some limited interoperability issues.
-Here are some examples current as of bzr-svn 0.49:
+Here are some examples current as of bzr-svn 0.4.10:
* Bazaar doesn't support versioned properties
- * Renames are not correctly communicated.
+ * Bazaar doesn't support tracking of file copies.
+
+ * ``bzr push`` to an existing Subversion branch works but
+ ``bzr push`` to a new Subversion branch doesn't. Until
+ the relevant bug is fixed (#121875), you need to use
+ ``bzr svn-push`` in the latter case.
See the bzr-svn web page,
http://bazaar-vcs.org/BzrForeignBranches/Subversion,
=== modified file 'doc/en/user-guide/web_browsing.txt'
--- a/doc/en/user-guide/web_browsing.txt 2008-05-09 06:52:35 +0000
+++ b/doc/en/user-guide/web_browsing.txt 2008-05-16 21:00:25 +0000
@@ -11,7 +11,7 @@
* webserve
* Loggerhead
-The first 2 tools are lightweight and easy to install.
+The first two tools are lightweight and easy to install.
Loggerhead takes more effort to setup but provides more functionality.
See http://bazaar-vcs.org/WebInterface for the latest information on
these packages including download links.
More information about the bazaar-commits
mailing list