~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

Integrate latest bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
238
238
 
239
239
        if reporter is None and self.reporter is None:
240
240
            self.reporter = NullCommitReporter()
241
 
        else:
 
241
        elif reporter is not None:
242
242
            self.reporter = reporter
243
243
 
244
244
        self.work_tree.lock_write()