~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-10 10:54:39 UTC
  • mfrom: (5141.1.1 commit)
  • Revision ID: pqm@pqm.ubuntu.com-20100410105439-cr8xiumgfetq517v
(robertc) Fix regression in MutableTree.commit where it ignores passed in
 configs. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
243
243
        """
244
244
        operation = OperationWithCleanups(self._commit)
245
245
        self.revprops = revprops or {}
 
246
        # XXX: Can be set on __init__ or passed in - this is a bit ugly.
 
247
        self.config = config or self.config
246
248
        return operation.run(
247
249
               message=message,
248
250
               timestamp=timestamp,
256
258
               working_tree=working_tree,
257
259
               local=local,
258
260
               reporter=reporter,
259
 
               config=config,
260
261
               message_callback=message_callback,
261
262
               recursive=recursive,
262
263
               exclude=exclude,
264
265
 
265
266
    def _commit(self, operation, message, timestamp, timezone, committer,
266
267
            specific_files, rev_id, allow_pointless, strict, verbose,
267
 
            working_tree, local, reporter, config, message_callback, recursive,
 
268
            working_tree, local, reporter, message_callback, recursive,
268
269
            exclude, possible_master_transports):
269
270
        mutter('preparing to commit')
270
271