Bazaar

Merge lp:~vila/bzr/integration into lp:bzr

  1. integration
  2. Merge into bzr.dev
Proposed by Vincent Ladeuil
Status: Merged
Approved by: Vincent Ladeuil
Approved revision: not available
Merged at revision: 5435
Proposed branch: lp:~vila/bzr/integration
Merge into: lp:bzr
Diff against target: 471 lines (+248/-57)
2 files modified
NEWS (+247/-56)
bzrlib/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~vila/bzr/integration
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+36012@code.launchpad.net

Commit message

Re-open bzr.dev for dev as 2.3.0dev2

Description of the change

This merges the changes in NEWS for 2.3b1 and create a new
section for the upcoming 2.3b2.

Attention Patch Pilot: Double check the NEWS entries for the next landings ;)

To post a comment you must log in.
Revision history for this message
Vincent Ladeuil (vila) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'NEWS'
2--- NEWS 2010-09-20 04:56:26 +0000
3+++ NEWS 2010-09-20 13:37:45 +0000
4@@ -5,11 +5,58 @@
5 .. contents:: List of Releases
6 :depth: 1
7
8+bzr 2.3b2
9+#########
10+
11+:2.3.b2: NOT RELEASED YET
12+
13+Compatibility Breaks
14+********************
15+
16+New Features
17+************
18+
19+Bug Fixes
20+*********
21+
22+Improvements
23+************
24+
25+Documentation
26+*************
27+
28+API Changes
29+***********
30+
31+Internals
32+*********
33+
34+Testing
35+*******
36+
37+
38+
39 bzr 2.3b1
40 #########
41
42-:Codename: ???
43-:2.3b1: NOT RELEASED YET
44+:2.3b1: 2010-09-20
45+
46+This is the first beta of the 2.3 series, leading up to a 2.3.0
47+release in January or February. Beta releases are suitable for everyday use
48+but may cause some incompatibilities with plugins. Some plugins may need
49+small updates to work with 2.3b1.
50+
51+2.3b1 includes some performance improvements in both speed and memory
52+consumption, some preliminary support for generating a texinfo version of
53+the doc and better support for launchpad. Many changes were made to make
54+our test suite more robust as well as numerous documentation fixes. It
55+improves the common infrastructure for dealing with colocated named
56+branches and foreign branches. We plan to continue with these themes
57+through the 2.3 series.
58+
59+It also includes bug fixes for 2.0.6, 2.1.3 and 2.2.1 and over 40 fixes of
60+its own.
61+
62
63 Compatibility Breaks
64 ********************
65@@ -20,21 +67,34 @@
66 is now named "msg" instead of earlier "message".
67 (Parth Malwankar, #603461)
68
69+* Additional merges after an unrelated branch has been merged with its
70+ history no longer crash when deleted files are involved.
71+ (Vincent Ladeuil, John Arbash Meinel, #375898)
72+
73+* ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
74+ previously-unversioned directory within the tree: the directory is
75+ marked versioned too.
76+ (Martin Pool, #192859)
77+
78+* ``bzr commit SYMLINK`` now works, rather than trying to commit the
79+ target of the symlink.
80+ (Martin Pool, John Arbash Meinel, #128562)
81+
82+* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
83+ permissions as ``.bzr`` directory on a POSIX OS.
84+ (Parth Malwankar, #262450)
85+
86 * ``bzrlib.transform.TreeTransformBase.final_kind``,
87 ``bzrlib.transform.TreeTransform.tree_kind`` and
88 ``bzrlib.transform.TransformPreview.tree_kind`` now return None instead
89 of raising NoSuchFile. (Vincent Ladeuil)
90
91-* `decode` parameter to get() method in FtpTransport and GioTransport classes
92- is deprecated. (Alexander Belchenko)
93-
94-* `FileInWrongBranch` is deprecated in favour of `PathNotChild` and no
95- longer raised.
96- (Martin Pool)
97-
98-* `tree_files` and `internal_tree_files` are now deprecated in favor of
99- `WorkingTree.open_containing_paths`.
100- (Martin Pool)
101+* CommitBuilder now uses the committer instead of _config.username to generate
102+ the revision-id. (Aaron Bentley, #614404)
103+
104+* Configuration files in ``${BZR_HOME}`` are now written in an atomic
105+ way which should help avoid problems with concurrent writers.
106+ (Vincent Ladeuil, #525571)
107
108 * `ControlDirFormat` and `ControlDir` have been split out of `BzrDirFormat`
109 and `BzrDir`, respectively. `ControlDirFormat`
110@@ -60,11 +120,79 @@
111
112 (Jelmer Vernooij)
113
114+* Cope with Microsoft FTP server that returns reply '250 Directory
115+ created' when mkdir succeeds. (Martin Pool, #224373)
116+
117+* Don't traceback when a lockdir's ``held/info`` file is corrupt (e.g.
118+ contains only NUL bytes). Instead warn the user, and allow ``bzr
119+ break-lock`` to remove it. (Andrew Bennetts, #619872)
120+
121+* `decode` parameter to get() method in FtpTransport and GioTransport classes
122+ is deprecated. (Alexander Belchenko)
123+
124+* `FileInWrongBranch` is deprecated in favour of `PathNotChild` and no
125+ longer raised.
126+ (Martin Pool)
127+
128+* Fix ``AttributeError on parent.children`` when adding a file under a
129+ directory that was a symlink in the previous commit.
130+ (Martin Pool, #192859)
131+
132+* Fix ``AttributeError: 'NoneType' object has no attribute 'close'`` in
133+ ``_close_ssh_proc`` when using ``bzr+ssh://``. This was causing
134+ connections to pre-1.6 bzr+ssh servers to fail, and causing warnings on
135+ stderr in some other circumstances. (Andrew Bennetts, #633745)
136+
137+* Only call ``setlocale`` in the bzr startup script on posix systems. This
138+ avoids an issue with the newer windows C runtimes used by Python 2.6 and
139+ later which can mangle bytestrings printed to the console.
140+ (Martin [gz], #631350)
141+
142+* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
143+ which can result in "missing referenced chk root keys" errors when
144+ fetching from repositories with affected revisions.
145+ (Andrew Bennetts, #522637)
146+
147+* Raise ValueError instead of a string exception.
148+ (John Arbash Meinel, #586926)
149+
150+* Reduce peak memory by one copy of compressed text.
151+ (John Arbash Meinel, #566940)
152+
153+* Repositories accessed via a smart server now reject being stacked on a
154+ repository in an incompatible format, as is the case when accessing them
155+ via other methods. This was causing fetches from those repositories via
156+ a smart server (e.g. using ``bzr branch``) to receive invalid data.
157+ (Andrew Bennetts, #562380)
158+
159+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
160+ error. This error was caused by 2.0 not being updated when upstream
161+ python merged the end of run patch, which chose ``stopTestRun`` rather than
162+ ``done``. (Robert Collins, #571437)
163+
164+* Stop ``AttributeError: 'module' object has no attribute 'ElementTree'``
165+ being thrown from ``xml_serializer`` on certain cElementTree setups.
166+ (Martin [gz], #254278)
167+
168 * The old ``bzr selftest --benchmark`` option has been removed.
169 <https://launchpad.net/bzr-usertest> is an actively-maintained
170 macrobenchmark suite.
171 (Martin Pool)
172
173+* `tree_files` and `internal_tree_files` are now deprecated in favor of
174+ `WorkingTree.open_containing_paths`.
175+ (Martin Pool)
176+
177+* Upgrading or fetching from a non-rich-root repository to a rich-root
178+ repository (e.g. from pack-0.92 to 2a) no longer fails with
179+ ``'Inter1and2Helper' object has no attribute 'source_repo'``. This was
180+ a regression from Bazaar 2.1. (Andrew Bennetts, #636930)
181+
182+* When passing a file to ``UTF8DirReader`` make sure to close the current
183+ directory file handle after the chdir fails. Otherwise when passing many
184+ filenames into a command line ``bzr status`` we would leak descriptors.
185+ (John Arbash Meinel, #583486)
186+
187 New Features
188 ************
189
190@@ -294,6 +422,9 @@
191 Testing
192 *******
193
194+* ``build_tree_contents`` can create symlinks.
195+ (Martin Pool, John Arbash Meinel)
196+
197 * Catch socket errors to avoid
198 bt.test_sftp_transport.SSHVendorBadConnection.test_bad_connection_ssh
199 random failures. (Vincent Ladeuil, #601804)
200@@ -333,23 +464,45 @@
201 bzr 2.2.1
202 #########
203
204-:Codename: ??
205-:2.2.1: NOT RELEASED YET
206+:2.2.1: 2010-09-17
207+
208+This is a bugfix release which also includes bugfixes from 2.0.6 and
209+2.1.3. None are critical, but upgrading is recommended for all users on
210+earlier 2.2 releases.
211
212 Bug Fixes
213 *********
214
215+* Additional merges after an unrelated branch has been merged with its
216+ history no longer crash when deleted files are involved.
217+ (Vincent Ladeuil, John Arbash Meinel, #375898)
218+
219 * ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
220 previously-unversioned directory within the tree: the directory is
221 marked versioned too.
222 (Martin Pool, #192859)
223
224+* ``bzr commit SYMLINK`` now works, rather than trying to commit the
225+ target of the symlink.
226+ (Martin Pool, John Arbash Meinel, #128562)
227+
228+* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
229+ permissions as ``.bzr`` directory on a POSIX OS.
230+ (Parth Malwankar, #262450)
231+
232 * CommitBuilder now uses the committer instead of _config.username to generate
233 the revision-id. (Aaron Bentley, #614404)
234
235+* Configuration files in ``${BZR_HOME}`` are now written in an atomic
236+ way which should help avoid problems with concurrent writers.
237+ (Vincent Ladeuil, #525571)
238+
239 * Cope with Microsoft FTP server that returns reply '250 Directory
240 created' when mkdir succeeds. (Martin Pool, #224373)
241
242+* Don't traceback trying to unversion children files of an already
243+ unversioned directory. (Vincent Ladeuil, #494221)
244+
245 * Don't traceback when a lockdir's ``held/info`` file is corrupt (e.g.
246 contains only NUL bytes). Instead warn the user, and allow ``bzr
247 break-lock`` to remove it. (Andrew Bennetts, #619872)
248@@ -368,14 +521,41 @@
249 later which can mangle bytestrings printed to the console.
250 (Martin [gz], #631350)
251
252+* Prevent ``CHKMap.apply_delta`` from generating non-canonical CHK maps,
253+ which can result in "missing referenced chk root keys" errors when
254+ fetching from repositories with affected revisions.
255+ (Andrew Bennetts, #522637)
256+
257+* Raise ValueError instead of a string exception.
258+ (John Arbash Meinel, #586926)
259+
260+* Reduce peak memory by one copy of compressed text.
261+ (John Arbash Meinel, #566940)
262+
263+* Repositories accessed via a smart server now reject being stacked on a
264+ repository in an incompatible format, as is the case when accessing them
265+ via other methods. This was causing fetches from those repositories via
266+ a smart server (e.g. using ``bzr branch``) to receive invalid data.
267+ (Andrew Bennetts, #562380)
268+
269+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
270+ error. This error was caused by 2.0 not being updated when upstream
271+ python merged the end of run patch, which chose ``stopTestRun`` rather than
272+ ``done``. (Robert Collins, #571437)
273+
274+* Stop ``AttributeError: 'module' object has no attribute 'ElementTree'``
275+ being thrown from ``xml_serializer`` on certain cElementTree setups.
276+ (Martin [gz], #254278)
277+
278 * Upgrading or fetching from a non-rich-root repository to a rich-root
279 repository (e.g. from pack-0.92 to 2a) no longer fails with
280 ``'Inter1and2Helper' object has no attribute 'source_repo'``. This was
281 a regression from Bazaar 2.1. (Andrew Bennetts, #636930)
282
283-
284-Improvements
285-************
286+* When passing a file to ``UTF8DirReader`` make sure to close the current
287+ directory file handle after the chdir fails. Otherwise when passing many
288+ filenames into a command line ``bzr status`` we would leak descriptors.
289+ (John Arbash Meinel, #583486)
290
291 Documentation
292 *************
293@@ -393,6 +573,9 @@
294 Testing
295 *******
296
297+* ``build_tree_contents`` can create symlinks.
298+ (Martin Pool, John Arbash Meinel)
299+
300 * Tracebacks from a parameterized test are no longer reported against every
301 parameterization of that test. This was done by adding a hack to
302 ``bzrlib.tests.clone_test`` so that it no longer causes
303@@ -1191,8 +1374,8 @@
304 without specific permission from the user. (Martin Pool, #515052)
305
306 * Parsing of command lines, for example in ``diff --using``, no longer
307- treats backslash as an escape character on Windows. (Gordon Tyler,
308- #392428)
309+ treats backslash as an escape character on Windows.
310+ (Gordon Tyler, #392428)
311
312 * Plugins can be disabled by defining ``BZR_DISABLE_PLUGINS`` as
313 a list of plugin names separated by ':' (';' on windows).
314@@ -1431,22 +1614,32 @@
315 #########
316
317 :Codename: Do run run
318-:2.1.3: NOT RELEASED YET
319-
320-Compatibility Breaks
321-********************
322-
323-New Features
324-************
325+:2.1.3: 2010-09-17
326+
327+The third release in our 2.1 series addresses several user-inconvenience bugs
328+(and includes the fixes done in 2.0.6). None are critical, but upgrading is
329+recommended for all users on earlier 2.1 releases.
330
331 Bug Fixes
332 *********
333
334+* Additional merges after an unrelated branch has been merged with its
335+ history no longer crash when deleted files are involved.
336+ (Vincent Ladeuil, John Arbash Meinel, #375898)
337+
338 * ``bzr add SYMLINK/FILE`` now works properly when the symlink points to a
339 previously-unversioned directory within the tree: the directory is
340 marked versioned too.
341 (Martin Pool, #192859)
342
343+* ``bzr commit SYMLINK`` now works, rather than trying to commit the
344+ target of the symlink.
345+ (Martin Pool, John Arbash Meinel, #128562)
346+
347+* ``bzr upgrade`` now creates the ``backup.bzr`` directory with the same
348+ permissions as ``.bzr`` directory on a POSIX OS.
349+ (Parth Malwankar, #262450)
350+
351 * Configuration files in ``${BZR_HOME}`` are now written in an atomic
352 way which should help avoid problems with concurrent writers.
353 (Vincent Ladeuil, #525571)
354@@ -1474,40 +1667,34 @@
355 * Raise ValueError instead of a string exception.
356 (John Arbash Meinel, #586926)
357
358-* Recursive binding for checkouts is now detected by bzr. A clear error
359- message is shown to the user. (Parth Malwankar, #405192)
360+* Reduce peak memory by one copy of compressed text.
361+ (John Arbash Meinel, #566940)
362+
363+* Repositories accessed via a smart server now reject being stacked on a
364+ repository in an incompatible format, as is the case when accessing them
365+ via other methods. This was causing fetches from those repositories via
366+ a smart server (e.g. using ``bzr branch``) to receive invalid data.
367+ (Andrew Bennetts, #562380)
368+
369+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
370+ error. This error was caused by 2.0 not being updated when upstream
371+ python merged the end of run patch, which chose ``stopTestRun`` rather than
372+ ``done``. (Robert Collins, #571437)
373
374 * Stop ``AttributeError: 'module' object has no attribute 'ElementTree'``
375 being thrown from ``xml_serializer`` on certain cElementTree setups.
376 (Martin [gz], #254278)
377
378-Improvements
379-************
380-
381-* Add ``bzrlib.merge.MergeIntoMerger``, which can merge part or all of a
382- tree, and works with unrelated branches. (Andrew Bennetts)
383-
384-Documentation
385-*************
386-
387-* ``bzr help patterns`` now explains case insensitive patterns and
388- points to Python regular expression documentation.
389- (Parth Malwankar, #594386)
390-
391-API Changes
392-***********
393-
394-* Delete ``ProgressTask.note``, which was deprecated in 2.1.
395-
396-Internals
397-*********
398+* When passing a file to ``UTF8DirReader`` make sure to close the current
399+ directory file handle after the chdir fails. Otherwise when passing many
400+ filenames into a command line ``bzr status`` we would leak descriptors.
401+ (John Arbash Meinel, #583486)
402
403 Testing
404 *******
405
406-* Unit test added to ensure that "message" is not uses as a format variable
407- name in BzrError subclasses as this conflicts with some Python versions.
408- (Parth Malwankar, #603461)
409+* ``build_tree_contents`` can create symlinks.
410+ (Martin Pool, John Arbash Meinel)
411
412 bzr 2.1.2
413 #########
414@@ -1987,7 +2174,11 @@
415 bzr 2.0.6
416 #########
417
418-:2.0.6: NOT RELEASED YET
419+:2.0.6: 2010-09-17
420+
421+The sixth release in our 2.0 series addresses several user-inconvenience
422+bugs. None are critical, but upgrading is recommended for all users on
423+earlier 2.0 releases.
424
425 Bug Fixes
426 *********
427@@ -6355,7 +6546,7 @@
428 when the path to the root of the tree has been given. Users of
429 the internal ``show_tree_status`` function should be aware that
430 the show_pending flag is now authoritative for showing pending
431- merges, as it was originally. (Robert Collins, #225204)
432+ merges, as it was originally. (Robert Collins, #255204)
433
434 * Set valid default _param_name for Option so that ListOption can embed
435 '-' in names. (Vincent Ladeuil, #263249)
436@@ -10271,7 +10462,7 @@
437 hyphen. (``'abc'`` versus ``'abc-2'``). The WT4._iter_changes
438 iterator was using direct comparison and ``'abc/a'`` sorts after
439 ``'abc-2'``, but ``('abc', 'a')`` sorts before ``('abc-2',)``.
440- (John Arbash Meinel, #111227)
441+ (John Arbash Meinel, #111127)
442
443 * Handle when someone renames a file on disk without telling bzr.
444 Previously we would report the first file as missing, but not show
445@@ -11555,11 +11746,11 @@
446 * ``Branch.bind(other_branch)`` no longer takes a write lock on the
447 other branch, and will not push or pull between the two branches.
448 API users will need to perform a push or pull or update operation if they
449- require branch synchronisation to take place. (Robert Collins, #47344)
450+ require branch synchronisation to take place. (Robert Collins, #43744)
451
452 * When creating a tarball or zipfile export, export unicode names as utf-8
453 paths. This may not work perfectly on all platforms, but has the best
454- chance of working in the common case. (John Arbash Meinel, #56816)
455+ chance of working in the common case. (John Arbash Meinel, #56815)
456
457 * When committing, only files that exist in working tree or basis tree
458 may be specified (Aaron Bentley, #50793)
459
460=== modified file 'bzrlib/__init__.py'
461--- bzrlib/__init__.py 2010-08-06 19:54:45 +0000
462+++ bzrlib/__init__.py 2010-09-20 13:37:45 +0000
463@@ -52,7 +52,7 @@
464 # Python version 2.0 is (2, 0, 0, 'final', 0)." Additionally we use a
465 # releaselevel of 'dev' for unreleased under-development code.
466
467-version_info = (2, 3, 0, 'dev', 1)
468+version_info = (2, 3, 0, 'dev', 2)
469
470 # API compatibility version
471 api_minimum_version = (2, 2, 0)