Merge lp:~weyrick/bzr/720853-max-recursion-depth into lp:bzr
Proposed by
Shannon Weyrick
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | John A Meinel | ||||||||
Approved revision: | no longer in the source branch. | ||||||||
Merged at revision: | 6268 | ||||||||
Proposed branch: | lp:~weyrick/bzr/720853-max-recursion-depth | ||||||||
Merge into: | lp:bzr | ||||||||
Diff against target: |
58 lines (+18/-0) 3 files modified
bzrlib/btree_index.py (+7/-0) bzrlib/tests/test_btree_index.py (+8/-0) doc/en/release-notes/bzr-2.5.txt (+3/-0) |
||||||||
To merge this branch: | bzr merge lp:~weyrick/bzr/720853-max-recursion-depth | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
John A Meinel | Approve | ||
Review via email: mp+82453@code.launchpad.net |
Commit message
Raise BadIndexKey rather than crashing if the key is unreasonably long.
Description of the change
Version 2 of this patch, which fixes the recursion issue in a way that doesn't break the pack command
To post a comment you must log in.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 11/16/2011 10:09 PM, Shannon Weyrick wrote: /bugs.launchpad .net/bzr/ +bug/720853 Bug #889872 in Bazaar: /bugs.launchpad .net/bzr/ +bug/889872 /code.launchpad .net/~weyrick/ bzr/720853- max-recursion- depth/+ merge/82453
> Shannon Weyrick has proposed merging
> lp:~weyrick/bzr/720853-max-recursion-depth into lp:bzr.
>
> Requested reviews: bzr-core (bzr-core) Related bugs: Bug #720853 in
> Bazaar: "bzr crashed with RuntimeError in normpath(): maximum
> recursion depth exceeded while calling a Python object"
> https:/
> "not a valid key error" https:/
>
> For more details, see:
> https:/
>
> Version 2 of this patch, which fixes the recursion issue in a way
> that doesn't break the pack command
merge: approve
John
=:->
-----BEGIN PGP SIGNATURE----- enigmail. mozdev. org/
E3pAACgkQJdeBCY SNAANS6wCg11uES tRmQaGk38pF45Dg kuOh +kIa7PPwiRSlY4y Zu
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://
iEYEARECAAYFAk7
Ef4AoJh16ykm7zk
=l+zk
-----END PGP SIGNATURE-----