Rev 6030: (vila) Release 2.4.0 (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.4/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Thu Aug 11 12:20:45 UTC 2011
At file:///home/pqm/archives/thelove/bzr/2.4/
------------------------------------------------------------
revno: 6030 [merge]
revision-id: pqm at pqm.ubuntu.com-20110811122042-efwcxkp2fgiqoj0m
parent: pqm at pqm.ubuntu.com-20110810170153-hs7vuauw37vqi8qu
parent: v.ladeuil+lp at free.fr-20110811090318-thkz8du2p0boiky5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.4
timestamp: Thu 2011-08-11 12:20:42 +0000
message:
(vila) Release 2.4.0 (Vincent Ladeuil)
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
doc/en/whats-new/whats-new-in-2.4.txt whatsnewin2.4.txt-20110114044330-nipk1og7j729fy89-1
=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py 2011-07-15 08:25:00 +0000
+++ b/bzrlib/__init__.py 2011-08-11 09:03:18 +0000
@@ -52,7 +52,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 = (2, 4, 0, 'dev', 6)
+version_info = (2, 4, 0, 'final', 0)
# API compatibility version
api_minimum_version = (2, 4, 0)
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py 2011-07-25 07:51:35 +0000
+++ b/bzrlib/config.py 2011-08-11 09:03:18 +0000
@@ -171,9 +171,7 @@
# FIXME: Until we can guarantee that each config file is loaded once and
# only once for a given bzrlib session, we don't want to re-read the file every
# time we query for an option so we cache the value (bad ! watch out for tests
-# needing to restore the proper value).This shouldn't be part of 2.4.0 final,
-# yell at mgz^W vila and the RM if this is still present at that time
-# -- vila 20110219
+# needing to restore the proper value). -- vila 20110219
_expand_default_value = None
def _get_expand_default_value():
global _expand_default_value
@@ -1504,14 +1502,16 @@
raise errors.BzrError('You must have one of BZR_HOME, APPDATA,'
' or HOME set')
return osutils.pathjoin(base, 'bazaar', '2.0')
- elif sys.platform == 'darwin':
+ else:
+ if base is not None:
+ base = base.decode(osutils._fs_enc)
+ if sys.platform == 'darwin':
if base is None:
# this takes into account $HOME
base = os.path.expanduser("~")
return osutils.pathjoin(base, '.bazaar')
else:
if base is None:
-
xdg_dir = os.environ.get('XDG_CONFIG_HOME', None)
if xdg_dir is None:
xdg_dir = osutils.pathjoin(os.path.expanduser("~"), ".config")
@@ -1520,7 +1520,6 @@
trace.mutter(
"Using configuration in XDG directory %s." % xdg_dir)
return xdg_dir
-
base = os.path.expanduser("~")
return osutils.pathjoin(base, ".bazaar")
=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt 2011-08-10 17:01:53 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt 2011-08-11 09:03:18 +0000
@@ -8,7 +8,23 @@
bzr 2.4.0
#########
-:2.4.0: NOT RELEASED YET
+:2.4.0: 2011-08-11
+
+This release marks the start of a new long-term-stable series. From here, we
+will only make bugfix releases on the 2.4 series (2.4.1, etc, and support it
+until February 2013), while 2.5 will become our new development series.
+
+This is a bugfix and polish release over the 2.3 series, with a large number
+of bugs fixed (>150 for the 2.4 series alone), and some performance
+improvements. Support for python 2.4 and 2.5 has been dropped, many large
+working tree operations have been optimized as well as some stacked branches
+operations.
+
+Only bugfixes from other stables series have been included since 2.4b5 so
+all known fixed bugs are included here.
+
+Users are encouraged to upgrade from the other stable series.
+
External Compatibility Breaks
*****************************
@@ -121,7 +137,7 @@
:2.4b5: 2011-07-07
This is the fifth (and last) beta of the 2.4 series leading to
-2.4.0 release in Auguest 2011. Beta releases are suitable for
+2.4.0 release in August 2011. Beta releases are suitable for
everyday use but may cause some incompatibilities with plugins.
This release includes all bug fixed in previous series known at
@@ -306,7 +322,7 @@
* Reports the original error when an InvalidHttpResponse exception is
encountered to facilitate debug. (Vincent Ladeuil, #788530)
-* Reports a non-existant file error when trying to merge in a file
+* Reports a non-existent file error when trying to merge in a file
that does not exist. (Jonathan Riddell, #330063)
* ``UIFactory.prompt``, ``UIFactory.get_username``,
@@ -388,7 +404,7 @@
(Vincent Ladeuil, #787942)
* Re-target ``bb.test_merge.TestMerge.test_merge_reversed_revision_range``
- and rewrite it as a parameterized test to avoid unrelated failures.
+ and rewrite it as a parametrized test to avoid unrelated failures.
(Vincent Ladeuil, #795456)
* Show log file contents from subprocesses started by
@@ -396,7 +412,7 @@
strange hangs and failures involving subprocesses. (Andrew Bennetts)
* Skip ``utextwrap`` tests when ``sphinx`` breaks text_wrap by an hostile
- monkeypatch to textwrap.TextWrapper.wordsep_re.
+ monkey-patch to textwrap.TextWrapper.wordsep_re.
(Vincent Ladeuil, #785098)
* Multiple ``selftest --exclude`` options are now combined instead of
@@ -1085,7 +1101,7 @@
by catching them so they can be re-raised in the controlling thread. It's
available in the ``bzrlib.cethread`` module. (Vincent Ladeuil)
-* Correctly propogate malloc failures from diff-delta.c code as MemoryError
+* Correctly propagate malloc failures from diff-delta.c code as MemoryError
so OOM conditions during groupcompress are clearly reported. This entailed a
change to several function signatures. (Martin [gz], #633336)
=== modified file 'doc/en/whats-new/whats-new-in-2.4.txt'
--- a/doc/en/whats-new/whats-new-in-2.4.txt 2011-08-10 07:30:03 +0000
+++ b/doc/en/whats-new/whats-new-in-2.4.txt 2011-08-11 09:03:18 +0000
@@ -1,8 +1,12 @@
-***********************************
-What's New in Bazaar 2.4 (Oronsay)?
-***********************************
-
-Bazaar 2.4 is still under development, and will be released in August 2011.
+**********************************
+What's New in Bazaar 2.4 (Oronsay)
+**********************************
+
+Bazaar 2.4 has been released on the 8th of August 2011 and marks the start
+of a new long-term-stable series. From here, we will only make bugfix
+releases on the 2.4 series (2.4.1, etc, and support it until February 2013),
+while 2.5 will become our new development series.
+
This document accumulates a high level summary of what's changed. See the
:doc:`../release-notes/index` for a full list.
@@ -59,10 +63,10 @@
Configuration files
*******************
-Option values can now refer to other options in the same configuration file by
-enclosing them in curly brackets (``{option}``). This is an opt-in feature
-during the beta period controlled by the ``bzr.config.expand`` option that
-should be declared in ``bazaar.conf`` and no other file.
+Option values can now refer to other options in the same configuration file
+by enclosing them in curly brackets (``{option}``). This is an opt-in
+feature controlled by the ``bzr.config.expand`` option that should be
+declared in ``bazaar.conf`` and no other file.
Changelog merge plugin
**********************
@@ -119,7 +123,7 @@
The ``selftest --exclude`` option can now be specified multiple times and
the tests that match any of the specified patterns will be excluded. Only
-the last specified patetrn was previously taken into account.
+the last specified pattern was previously taken into account.
Digital Signature Verification
******************************
More information about the bazaar-commits
mailing list