← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Merged latest from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
36
36
from bzrlib.log import show_one_log
37
37
from bzrlib.merge import Merge3Merger
38
38
from bzrlib.option import Option
39
 
from bzrlib.progress import DummyProgress
 
39
from bzrlib.progress import DummyProgress, ProgressPhase
40
40
from bzrlib.revisionspec import RevisionSpec
41
41
import bzrlib.trace
42
42
from bzrlib.trace import mutter, note, log_error, warning, is_quiet
1917
1917
                    restore(tree.abspath(filename))
1918
1918
                except NotConflicted:
1919
1919
                    pass
1920
 
            conflicts =  merge_inner(tree.branch, other_tree, base_tree, 
 
1920
            conflicts =  merge_inner(tree.branch, other_tree, base_tree,
 
1921
                                     this_tree=tree,
1921
1922
                                     interesting_ids = interesting_ids, 
1922
1923
                                     other_rev_id=pending_merges[0], 
1923
1924
                                     merge_type=merge_type, 
2381
2382
                              " type. %s" % merge_type)
2382
2383
    if reprocess and show_base:
2383
2384
        raise BzrCommandError("Cannot reprocess and show base.")
2384
 
    merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
2385
 
    merger.check_basis(check_clean)
2386
 
    merger.set_other(other_revision)
2387
 
    merger.set_base(base_revision)
2388
 
    if merger.base_rev_id == merger.other_rev_id:
2389
 
        note('Nothing to do.')
2390
 
        return 0
2391
 
    merger.backup_files = backup_files
2392
 
    merger.merge_type = merge_type 
2393
 
    merger.set_interesting_files(file_list)
2394
 
    merger.show_base = show_base 
2395
 
    merger.reprocess = reprocess
2396
 
    conflicts = merger.do_merge()
2397
 
    merger.set_pending()
 
2385
    try:
 
2386
        merger = Merger(this_tree.branch, this_tree=this_tree, pb=pb)
 
2387
        merger.pp = ProgressPhase("Merge phase", 5, pb)
 
2388
        merger.pp.next_phase()
 
2389
        merger.check_basis(check_clean)
 
2390
        merger.set_other(other_revision)
 
2391
        merger.pp.next_phase()
 
2392
        merger.set_base(base_revision)
 
2393
        if merger.base_rev_id == merger.other_rev_id:
 
2394
            note('Nothing to do.')
 
2395
            return 0
 
2396
        merger.backup_files = backup_files
 
2397
        merger.merge_type = merge_type 
 
2398
        merger.set_interesting_files(file_list)
 
2399
        merger.show_base = show_base 
 
2400
        merger.reprocess = reprocess
 
2401
        conflicts = merger.do_merge()
 
2402
        merger.set_pending()
 
2403
    finally:
 
2404
        pb.clear()
2398
2405
    return conflicts
2399
2406
 
2400
2407