/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2010-03-12 07:04:40 UTC
  • mto: This revision was merged to the branch mainline in revision 5137.
  • Revision ID: robertc@robertcollins.net-20100312070440-p5udg6m6a1nm073q
Minor commit tidyup in preparation for hooking around revprops.

Show diffs side-by-side

added added

removed removed

Lines of Context:
236
236
            commit.
237
237
        """
238
238
        operation = OperationWithCleanups(self._commit)
 
239
        self.revprops = revprops or {}
239
240
        return operation.run(
240
241
               message=message,
241
242
               timestamp=timestamp,
246
247
               allow_pointless=allow_pointless,
247
248
               strict=strict,
248
249
               verbose=verbose,
249
 
               revprops=revprops,
250
250
               working_tree=working_tree,
251
251
               local=local,
252
252
               reporter=reporter,
257
257
               possible_master_transports=possible_master_transports)
258
258
 
259
259
    def _commit(self, operation, message, timestamp, timezone, committer,
260
 
            specific_files, rev_id, allow_pointless, strict, verbose, revprops,
 
260
            specific_files, rev_id, allow_pointless, strict, verbose,
261
261
            working_tree, local, reporter, config, message_callback, recursive,
262
262
            exclude, possible_master_transports):
263
263
        mutter('preparing to commit')
299
299
            self.specific_files = None
300
300
            
301
301
        self.allow_pointless = allow_pointless
302
 
        self.revprops = revprops
303
302
        self.message_callback = message_callback
304
303
        self.timestamp = timestamp
305
304
        self.timezone = timezone
371
370
        # Collect the changes
372
371
        self._set_progress_stage("Collecting changes", counter=True)
373
372
        self.builder = self.branch.get_commit_builder(self.parents,
374
 
            self.config, timestamp, timezone, committer, revprops, rev_id)
 
373
            self.config, timestamp, timezone, committer, self.revprops, rev_id)
375
374
 
376
375
        try:
377
376
            self.builder.will_record_deletes()