/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to diff.py

  • Committer: Martin Pool
  • Date: 2010-05-27 03:07:30 UTC
  • mfrom: (688.1.5 201956-help)
  • Revision ID: mbp@canonical.com-20100527030730-os0opv1xroetccm9
https://launchpad.net/bugs/201965
Make find/goto more discoverable

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
17
17
import os
18
18
import re
19
19
import sys
20
 
from xml.etree.ElementTree import Element, SubElement, tostring
 
20
try:
 
21
    from xml.etree.ElementTree import Element, SubElement, tostring
 
22
except ImportError:
 
23
    from elementtree.ElementTree import Element, SubElement, tostring
21
24
 
22
25
try:
23
26
    import gtksourceview2
31
34
    have_gconf = False
32
35
 
33
36
from bzrlib import (
 
37
    errors,
34
38
    merge as _mod_merge,
35
39
    osutils,
36
 
    progress,
37
40
    urlutils,
38
41
    workingtree,
39
42
)
40
43
from bzrlib.diff import show_diff_trees, internal_diff
41
 
from bzrlib.errors import NoSuchFile
42
44
from bzrlib.patches import parse_patches
43
45
from bzrlib.trace import warning
44
46
from bzrlib.plugins.gtk import _i18n
373
375
                    tv_path = child.path
374
376
                    break
375
377
        if tv_path is None:
376
 
            raise NoSuchFile(file_path)
 
378
            raise errors.NoSuchFile(file_path)
377
379
        self.treeview.set_cursor(tv_path)
378
380
        self.treeview.scroll_to_cell(tv_path)
379
381
 
581
583
        tree.lock_write()
582
584
        try:
583
585
            try:
584
 
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
585
 
                    self.directive, progress.DummyProgress())
586
 
                merger.check_basis(True)
 
586
                if tree.has_changes():
 
587
                    raise errors.UncommittedChanges(tree)
 
588
                merger, verified = _mod_merge.Merger.from_mergeable(
 
589
                    tree, self.directive, pb=None)
587
590
                merger.merge_type = _mod_merge.Merge3Merger
588
591
                conflict_count = merger.do_merge()
589
592
                merger.set_pending()