← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/model/diff.py

  • Committer: Aaron Bentley
  • Date: 2009-09-01 19:00:46 UTC
  • mto: (9222.5.2)
  • mto: This revision was merged to the branch mainline in revision 9328.
  • Revision ID: aaron@canonical.com-20090901190046-o9nuzvk0fzhv67a3
Fix lint failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/model/diff.py
11
11
from bzrlib.branch import Branch
12
12
from bzrlib.diff import show_diff_trees
13
13
from bzrlib.patches import parse_patches
14
 
from bzrlib.merge import Merger, Merge3Merger
 
14
from bzrlib.merge import Merge3Merger
15
15
from lazr.delegates import delegates
16
16
import simplejson
17
17
from sqlobject import ForeignKey, IntCol, StringCol
104
104
                merger = Merge3Merger(
105
105
                    merge_target, merge_target, merge_base, merge_source,
106
106
                    do_merge=False)
107
 
                transform =merger.make_preview_transform()
 
107
                transform = merger.make_preview_transform()
108
108
                try:
109
109
                    to_tree = transform.get_preview_tree()
110
110
                    return Diff.fromTrees(merge_target, to_tree)