Rev 4842: Merge 2.0. in http://bazaar.launchpad.net/~lifeless/bzr/2.1
Robert Collins
robertc at robertcollins.net
Thu May 20 00:09:37 BST 2010
At http://bazaar.launchpad.net/~lifeless/bzr/2.1
------------------------------------------------------------
revno: 4842 [merge]
revision-id: robertc at robertcollins.net-20100519230933-z60pm9keo3fywvas
parent: pqm at pqm.ubuntu.com-20100518211815-qtbvq8qj4gg0v7c8
parent: pqm at pqm.ubuntu.com-20100519215940-l5f6wtm2jc20ajpx
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 2.1
timestamp: Thu 2010-05-20 11:09:33 +1200
message:
Merge 2.0.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_pyx.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
bzrlib/groupcompress.py groupcompress.py-20080705181503-ccbxd6xuy1bdnrpu-8
=== modified file 'NEWS'
--- a/NEWS 2010-05-04 13:46:14 +0000
+++ b/NEWS 2010-05-19 23:09:33 +0000
@@ -30,6 +30,12 @@
errors after two window resizes.
(Andrew Bennetts)
+* Reduce peak memory by one copy of compressed text.
+ (John Arbash Meinel, #566940)
+
+* Support Pyrex 0.9.9, required changing how we handle exceptionsin Pyrex.
+ (John Arbash Meinel, #582656)
+
Internals
*********
@@ -436,6 +442,10 @@
Bug Fixes
*********
+* Additional merges after an unrelated branch has been merged with its
+ history no longer crash when deleted files are involved.
+ (Vincent Ladeuil, John Arbash Meinel, #375898)
+
* ``bzr revert`` now only takes write lock on working tree, instead of on
both working tree and branch.
(Danny van Heumen, #498409)
@@ -444,9 +454,19 @@
permissions as ``.bzr`` directory on a POSIX OS.
(Parth Malwankar, #262450)
-* Additional merges after an unrelated branch has been merged with its
- history no longer crash when deleted files are involved.
- (Vincent Ladeuil, John Arbash Meinel, #375898)
+* Reduce peak memory by one copy of compressed text.
+ (John Arbash Meinel, #566940)
+
+* Selftest with versions of subunit that support ``stopTestRun`` will no longer
+ error. This error was caused by 2.0 not being updated when upstream
+ python merged the end of run patch, which chose ``stopTestRun`` rather than
+ ``done``. (Robert Collins, #571437)
+
+* Repositories accessed via a smart server now reject being stacked on a
+ repository in an incompatible format, as is the case when accessing them
+ via other methods. This was causing fetches from those repositories via
+ a smart server (e.g. using ``bzr branch``) to receive invalid data.
+ (Andrew Bennetts, #562380)
bzr 2.0.5
#########
=== modified file 'bzrlib/_dirstate_helpers_pyx.pyx'
--- a/bzrlib/_dirstate_helpers_pyx.pyx 2010-02-17 17:11:16 +0000
+++ b/bzrlib/_dirstate_helpers_pyx.pyx 2010-05-19 23:09:33 +0000
@@ -1219,7 +1219,7 @@
else:
try:
source_parent_id = self.old_dirname_to_file_id[old_dirname]
- except KeyError:
+ except KeyError, _:
source_parent_entry = self.state._get_entry(self.source_index,
path_utf8=old_dirname)
source_parent_id = source_parent_entry[0][2]
@@ -1236,7 +1236,7 @@
else:
try:
target_parent_id = self.new_dirname_to_file_id[new_dirname]
- except KeyError:
+ except KeyError, _:
# TODO: We don't always need to do the lookup, because the
# parent entry will be the same as the source entry.
target_parent_entry = self.state._get_entry(self.target_index,
@@ -1478,7 +1478,7 @@
# interface doesn't require it.
try:
self.current_root = self.search_specific_files.pop()
- except KeyError:
+ except KeyError, _:
raise StopIteration()
self.searched_specific_files.add(self.current_root)
# process the entries for this containing directory: the rest will be
@@ -1567,7 +1567,7 @@
# and e.winerror == ERROR_DIRECTORY
try:
e_winerror = e.winerror
- except AttributeError:
+ except AttributeError, _:
e_winerror = None
win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
if (e.errno in win_errors or e_winerror in win_errors):
@@ -1656,7 +1656,7 @@
try:
self.current_dir_info = self.dir_iterator.next()
self.current_dir_list = self.current_dir_info[1]
- except StopIteration:
+ except StopIteration, _:
self.current_dir_info = None
else: #(dircmp > 0)
# We have a dirblock entry for this location, but there
@@ -1803,7 +1803,7 @@
and stat.S_IEXEC & current_path_info[3].st_mode)
try:
relpath_unicode = self.utf8_decode(current_path_info[0])[0]
- except UnicodeDecodeError:
+ except UnicodeDecodeError, _:
raise errors.BadFilenameEncoding(
current_path_info[0], osutils._fs_enc)
if changed is not None:
@@ -1851,7 +1851,7 @@
try:
self.current_dir_info = self.dir_iterator.next()
self.current_dir_list = self.current_dir_info[1]
- except StopIteration:
+ except StopIteration, _:
self.current_dir_info = None
cdef object _next_consistent_entries(self):
=== modified file 'bzrlib/groupcompress.py'
--- a/bzrlib/groupcompress.py 2010-02-17 17:11:16 +0000
+++ b/bzrlib/groupcompress.py 2010-05-19 23:09:33 +0000
@@ -1631,6 +1631,7 @@
keys_to_add = []
def flush():
bytes = self._compressor.flush().to_bytes()
+ self._compressor = GroupCompressor()
index, start, length = self._access.add_raw_records(
[(None, len(bytes))], bytes)[0]
nodes = []
@@ -1639,7 +1640,6 @@
self._index.add_records(nodes, random_id=random_id)
self._unadded_refs = {}
del keys_to_add[:]
- self._compressor = GroupCompressor()
last_prefix = None
max_fulltext_len = 0
More information about the bazaar-commits
mailing list