/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: 2009-12-10 16:13:32 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20091210161332-d9vlfd6jy6zolxa1
Thanks to lamont, we know spell Prettifying with the right number of 't'.

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,
38
37
    merge as _mod_merge,
39
38
    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
44
45
from bzrlib.patches import parse_patches
45
46
from bzrlib.trace import warning
46
47
from bzrlib.plugins.gtk import _i18n
375
376
                    tv_path = child.path
376
377
                    break
377
378
        if tv_path is None:
378
 
            raise errors.NoSuchFile(file_path)
 
379
            raise NoSuchFile(file_path)
379
380
        self.treeview.set_cursor(tv_path)
380
381
        self.treeview.scroll_to_cell(tv_path)
381
382
 
583
584
        tree.lock_write()
584
585
        try:
585
586
            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)
 
587
                merger, verified = _mod_merge.Merger.from_mergeable(tree,
 
588
                    self.directive, progress.DummyProgress())
 
589
                merger.check_basis(True)
590
590
                merger.merge_type = _mod_merge.Merge3Merger
591
591
                conflict_count = merger.do_merge()
592
592
                merger.set_pending()