/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: Vincent Ladeuil
  • Date: 2010-02-24 07:47:17 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20100224074717-gac36h7b3wmhp91x
Fix 2.1.0 compatibility issue.

* diff.py:
(MergeDirectiveController.perform_merge): Fix 2.1.0 deprecation
warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
diff.py
34
34
    have_gconf = False
35
35
 
36
36
from bzrlib import (
 
37
    errors,
37
38
    merge as _mod_merge,
38
39
    osutils,
39
 
    progress,
40
40
    urlutils,
41
41
    workingtree,
42
42
)
43
43
from bzrlib.diff import show_diff_trees, internal_diff
44
 
from bzrlib.errors import NoSuchFile
45
44
from bzrlib.patches import parse_patches
46
45
from bzrlib.trace import warning
47
46
from bzrlib.plugins.gtk import _i18n
376
375
                    tv_path = child.path
377
376
                    break
378
377
        if tv_path is None:
379
 
            raise NoSuchFile(file_path)
 
378
            raise errors.NoSuchFile(file_path)
380
379
        self.treeview.set_cursor(tv_path)
381
380
        self.treeview.scroll_to_cell(tv_path)
382
381
 
584
583
        tree.lock_write()
585
584
        try:
586
585
            try:
587
 
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
588
 
                    self.directive, progress.DummyProgress())
589
 
                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)
590
590
                merger.merge_type = _mod_merge.Merge3Merger
591
591
                conflict_count = merger.do_merge()
592
592
                merger.set_pending()