Merge lp:~philip-peitsch/bzr/annotate-ghost-revs into lp:bzr
Status: | Work in progress | ||||||||
---|---|---|---|---|---|---|---|---|---|
Proposed branch: | lp:~philip-peitsch/bzr/annotate-ghost-revs | ||||||||
Merge into: | lp:bzr | ||||||||
Diff against target: |
22 lines (+5/-5) 1 file modified
bzrlib/annotate.py (+5/-5) |
||||||||
To merge this branch: | bzr merge lp:~philip-peitsch/bzr/annotate-ghost-revs | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Pool | Needs Information | ||
Review via email: mp+26460@code.launchpad.net |
Description of the change
I modified the indenting from line 232-238 so that if the origin is not in the revisions, it returns '?' for the rev number, author and date. This prevents it crashing if ghost revisions are involved... though this doesn't really help if one is interested in the data in these ghost revisions.
Unmerged revisions
- 4851. By Philip Peitsch
-
Fixing up bzr +x bit
- 4850. By Philip Peitsch
-
Cleaning up whitespace diffs and putting last_origin back inside elif and else clauses
- 4849. By Philip Peitsch
-
Merging bzr dev branch
- 4848. By Philip Peitsch
-
* Unfolded if clause in annotate.py up a level to reduce nesting slightly
* assign last_origin after all if clauses as this seems easier to read (and less error prone to being missed :)) - 4847. By zpp <zpp@launchpad>
-
Corrected indenting in annotate so that annotate won't crash if the file was modified in a merge
Thanks very much, that's a nice simple fix for this bug. I might incline towards unfolding the first "if" to the higher level so this does not get too indented.
Could you please complete the contributor agreement in <http:// www.canonical. com/contributor s> so that we can merge this?