← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
147
147
 
148
148
    def completed(self, revno, rev_id):
149
149
        self._note('Committed revision %d.', revno)
 
150
        # self._note goes to the console too; so while we want to log the
 
151
        # rev_id, we can't trivially only log it. (See bug 526425). Long
 
152
        # term we should rearrange the reporting structure, but for now
 
153
        # we just mutter seperately. We mutter the revid and revno together
 
154
        # so that concurrent bzr invocations won't lead to confusion.
 
155
        mutter('Committed revid %s as revno %d.', rev_id, revno)
150
156
 
151
157
    def deleted(self, path):
152
158
        self._note('deleted %s', path)
236
242
            commit.
237
243
        """
238
244
        operation = OperationWithCleanups(self._commit)
 
245
        self.revprops = revprops or {}
239
246
        return operation.run(
240
247
               message=message,
241
248
               timestamp=timestamp,
246
253
               allow_pointless=allow_pointless,
247
254
               strict=strict,
248
255
               verbose=verbose,
249
 
               revprops=revprops,
250
256
               working_tree=working_tree,
251
257
               local=local,
252
258
               reporter=reporter,
257
263
               possible_master_transports=possible_master_transports)
258
264
 
259
265
    def _commit(self, operation, message, timestamp, timezone, committer,
260
 
            specific_files, rev_id, allow_pointless, strict, verbose, revprops,
 
266
            specific_files, rev_id, allow_pointless, strict, verbose,
261
267
            working_tree, local, reporter, config, message_callback, recursive,
262
268
            exclude, possible_master_transports):
263
269
        mutter('preparing to commit')
299
305
            self.specific_files = None
300
306
            
301
307
        self.allow_pointless = allow_pointless
302
 
        self.revprops = revprops
303
308
        self.message_callback = message_callback
304
309
        self.timestamp = timestamp
305
310
        self.timezone = timezone
371
376
        # Collect the changes
372
377
        self._set_progress_stage("Collecting changes", counter=True)
373
378
        self.builder = self.branch.get_commit_builder(self.parents,
374
 
            self.config, timestamp, timezone, committer, revprops, rev_id)
 
379
            self.config, timestamp, timezone, committer, self.revprops, rev_id)
375
380
 
376
381
        try:
377
382
            self.builder.will_record_deletes()