Merge lp:~jelmer/brz/fix-shelve into lp:brz

Proposed by Jelmer Vernooij on 2018-09-15
Status: Merged
Approved by: Jelmer Vernooij on 2018-09-15
Approved revision: 7117
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/fix-shelve
Merge into: lp:brz
Diff against target: 12 lines (+1/-1)
1 file modified
breezy/shelf_ui.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/fix-shelve
Reviewer Review Type Date Requested Status
Martin Packman 2018-09-15 Approve on 2018-09-15
Review via email: mp+354982@code.launchpad.net

Commit message

Fix displaying of diff chunks in shelf.

Description of the change

Fix displaying of diff chunks in shelf.

To post a comment you must log in.
Jelmer Vernooij (jelmer) wrote :

Filed bug 1792697 about increasing test coverage.

Martin Packman (gz) wrote :

Thanks!

review: Approve
The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/485/

The Breezy Bot (the-breezy-bot) wrote :

Running landing tests failed
https://ci.breezy-vcs.org/job/land-brz/486/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/shelf_ui.py'
2--- breezy/shelf_ui.py 2018-07-22 17:06:14 +0000
3+++ breezy/shelf_ui.py 2018-09-15 11:05:44 +0000
4@@ -334,7 +334,7 @@
5 offset = 0
6 self.diff_writer.write(parsed.get_header())
7 for hunk in parsed.hunks:
8- self.diff_writer.write(bytes(hunk))
9+ self.diff_writer.write(hunk.as_bytes())
10 selected = self.prompt_bool(self.reporter.vocab['hunk'],
11 allow_editor=(self.change_editor
12 is not None))

Subscribers

People subscribed via source and target branches