/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: Toshio Kuratomi
  • Date: 2009-11-13 19:07:28 UTC
  • mto: This revision was merged to the branch mainline in revision 669.
  • Revision ID: toshio@fedoraproject.org-20091113190728-9oybu21cuz2gq4s5
Fix import of error_dialog.

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