~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2007-02-09 15:56:49 UTC
  • mto: This revision was merged to the branch mainline in revision 2288.
  • Revision ID: abentley@panoramicfeedback.com-20070209155649-qxg6cqptrwyd4xof
Apply change reporting to merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
2333
2333
            merge_type = _mod_merge.Merge3Merger
2334
2334
 
2335
2335
        tree = WorkingTree.open_containing(u'.')[0]
 
2336
        change_reporter = delta.ChangeReporter(tree.inventory)
2336
2337
 
2337
2338
        if branch is not None:
2338
2339
            try:
2341
2342
                pass # Continue on considering this url a Branch
2342
2343
            else:
2343
2344
                conflicts = merge_bundle(reader, tree, not force, merge_type,
2344
 
                                            reprocess, show_base)
 
2345
                                         reprocess, show_base, change_reporter)
2345
2346
                if conflicts == 0:
2346
2347
                    return 0
2347
2348
                else:
2400
2401
                    reprocess=reprocess,
2401
2402
                    show_base=show_base,
2402
2403
                    pull=pull,
2403
 
                    pb=pb, file_list=interesting_files)
 
2404
                    pb=pb,
 
2405
                    file_list=interesting_files,
 
2406
                    change_reporter=change_reporter)
2404
2407
            finally:
2405
2408
                pb.finished()
2406
2409
            if conflict_count != 0:
3058
3061
                  merge_type=None,
3059
3062
                  file_list=None, show_base=False, reprocess=False,
3060
3063
                  pull=False,
3061
 
                  pb=DummyProgress()):
 
3064
                  pb=DummyProgress(),
 
3065
                  change_reporter=None):
3062
3066
    """Merge changes into a tree.
3063
3067
 
3064
3068
    base_revision
3102
3106
        raise errors.BzrCommandError("Cannot do conflict reduction and show base.")
3103
3107
    try:
3104
3108
        merger = _mod_merge.Merger(this_tree.branch, this_tree=this_tree,
3105
 
                                   pb=pb)
 
3109
                                   pb=pb, change_reporter=change_reporter)
3106
3110
        merger.pp = ProgressPhase("Merge phase", 5, pb)
3107
3111
        merger.pp.next_phase()
3108
3112
        merger.check_basis(check_clean)