← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Parth Malwankar
  • Date: 2010-04-19 13:23:53 UTC
  • mfrom: (5165 +trunk)
  • mto: (5183.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5184.
  • Revision ID: parth.malwankar@gmail.com-20100419132353-gwp4r4srafq2i2kb
merged in trunk and moved NEWS entry to 2.2b2

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 {}
 
246
        # XXX: Can be set on __init__ or passed in - this is a bit ugly.
 
247
        self.config = config or self.config
239
248
        return operation.run(
240
249
               message=message,
241
250
               timestamp=timestamp,
246
255
               allow_pointless=allow_pointless,
247
256
               strict=strict,
248
257
               verbose=verbose,
249
 
               revprops=revprops,
250
258
               working_tree=working_tree,
251
259
               local=local,
252
260
               reporter=reporter,
253
 
               config=config,
254
261
               message_callback=message_callback,
255
262
               recursive=recursive,
256
263
               exclude=exclude,
257
264
               possible_master_transports=possible_master_transports)
258
265
 
259
266
    def _commit(self, operation, message, timestamp, timezone, committer,
260
 
            specific_files, rev_id, allow_pointless, strict, verbose, revprops,
261
 
            working_tree, local, reporter, config, message_callback, recursive,
 
267
            specific_files, rev_id, allow_pointless, strict, verbose,
 
268
            working_tree, local, reporter, message_callback, recursive,
262
269
            exclude, possible_master_transports):
263
270
        mutter('preparing to commit')
264
271
 
299
306
            self.specific_files = None
300
307
            
301
308
        self.allow_pointless = allow_pointless
302
 
        self.revprops = revprops
303
309
        self.message_callback = message_callback
304
310
        self.timestamp = timestamp
305
311
        self.timezone = timezone
371
377
        # Collect the changes
372
378
        self._set_progress_stage("Collecting changes", counter=True)
373
379
        self.builder = self.branch.get_commit_builder(self.parents,
374
 
            self.config, timestamp, timezone, committer, revprops, rev_id)
 
380
            self.config, timestamp, timezone, committer, self.revprops, rev_id)
375
381
 
376
382
        try:
377
383
            self.builder.will_record_deletes()