/loggerhead/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/loggerhead/trunk

« back to all changes in this revision

Viewing changes to loggerhead/controllers/filediff_ui.py

  • Committer: Michael Hudson
  • Date: 2009-03-28 14:26:37 UTC
  • Revision ID: michael.hudson@canonical.com-20090328142637-7xqa14c8877jgq2z
fix diffs with bzr.dev -- oops, split_lines isn't as smart as I thought it was,
and Repository.iter_files_bytes now returns not completely trivial bytes
iterators.

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/filediff_ui.py
62
62
        else:
63
63
            args.append((file_id, r, r))
64
64
    for r, bytes_iter in repository.iter_files_bytes(args):
65
 
        lines[r] = osutils.split_lines(bytes_iter)
 
65
        lines[r] = osutils.split_lines(''.join(bytes_iter))
66
66
    buffer = StringIO()
67
67
    try:
68
68
        diff.internal_diff('', lines[compare_revid], '', lines[revid], buffer)