Merge lp://qastaging/~dobey/tarmac/commands-errors-decorator into lp://qastaging/tarmac
Proposed by
dobey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Paul Hummer | ||||
| Approved revision: | 356 | ||||
| Merged at revision: | 356 | ||||
| Proposed branch: | lp://qastaging/~dobey/tarmac/commands-errors-decorator | ||||
| Merge into: | lp://qastaging/tarmac | ||||
| Diff against target: |
347 lines (+111/-59) 7 files modified
docs/writingplugins.txt (+45/-0) tarmac/bin/commands.py (+27/-39) tarmac/branch.py (+10/-4) tarmac/exceptions.py (+10/-2) tarmac/plugins/command.py (+9/-7) tarmac/plugins/tests/test_votes.py (+2/-2) tarmac/plugins/votes.py (+8/-5) |
||||
| To merge this branch: | bzr merge lp://qastaging/~dobey/tarmac/commands-errors-decorator | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Paul Hummer | Pending | ||
|
Review via email:
|
|||
Commit message
Add a new TarmacMergeError exception class for handling merge-preventing errors
Simplify the _do_merges method to use TarmacMergeError
Move comment handling to the point of exception raising
Replace some exceptions with ones derived from TarmacMergeError
Improve some of the exception messages and launchpad comment strings
Document the handling of errors in the writing plug-ins documentation
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
