Merge lp://qastaging/~jelmer/launchpad/upgrade-stderr into lp://qastaging/launchpad
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | no longer in the source branch. |
Merged at revision: | 13553 |
Proposed branch: | lp://qastaging/~jelmer/launchpad/upgrade-stderr |
Merge into: | lp://qastaging/launchpad |
Diff against target: |
118 lines (+25/-16) 4 files modified
lib/lp/codehosting/codeimport/tests/test_uifactory.py (+10/-0) lib/lp/codehosting/codeimport/tests/test_worker.py (+5/-7) lib/lp/codehosting/codeimport/uifactory.py (+4/-0) lib/lp/codehosting/codeimport/worker.py (+6/-9) |
To merge this branch: | bzr merge lp://qastaging/~jelmer/launchpad/upgrade-stderr |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
j.c.sackett (community) | Approve | ||
Martin Pool (community) | Approve | ||
Tim Penhey | Pending | ||
Review via email: mp+69225@code.qastaging.launchpad.net |
This proposal supersedes a proposal from 2011-07-20.
Commit message
[r=jcsackett,mbp][bug=808035] Fix processing of code imports that are currently stored in an old bzr format.
Description of the change
Fix processing of code imports that are in an old bzr format:
1) Implement show_user_warning in the custom LoggingUIFactory used in the code import
workers. This fixes the immediate issue that causes the traceback,
and will prevent issues in the future if parts of bazaar print user warnings.
2) Reintroduce the automatic upgrading of code imports, and fix the related test.
Previously the test would compare the formats of the bzr dirs, both of which
would be "Bazaar-NG meta directory, format 1". The test now compares the
repository formats, which are different.
merge approve
vote approve
I wonder if the automatic upgrades will be safe. Perhaps you should check reviewers) /bugs.launchpad .net/launchpad/ +bug/808035 /code.launchpad .net/~jelmer/ launchpad/ upgrade- stderr/ +merge/ 68579 /code.launchpad .net/~jelmer/ launchpad/ upgrade- stderr/ +merge/ 68579
with Tim or guard it with a flag, if they're available there.
On Jul 21, 2011 3:30 AM, "Jelmer Vernooij" <email address hidden> wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/launchpad/upgrade-stderr
into lp:launchpad.
>
> Requested reviews:
> Launchpad code reviewers (launchpad-
> Related bugs:
> Bug #808035 in Launchpad itself: "AttributeError: 'NoneType' object has no
attribute 'write' during git import"
> https:/
>
> For more details, see:
> https:/
>
> Fix processing of code imports that are in an old bzr format:
>
> 1) Implement show_user_warning in the custom LoggingUIFactory used in the
code import
> workers. This fixes the immediate issue that causes the traceback,
> and will prevent issues in the future if parts of bazaar print user
warnings.
>
> 2) Reintroduce the automatic upgrading of code imports, and fix the
related test.
> Previously the test would compare the formats of the bzr dirs, both of
which
> would be "Bazaar-NG meta directory, format 1". The test now compares the
> repository formats, which are different.
> --
> https:/
> You are subscribed to branch lp:launchpad.