/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: Jelmer Vernooij
  • Date: 2010-04-30 11:03:59 UTC
  • mto: This revision was merged to the branch mainline in revision 5197.
  • Revision ID: jelmer@samba.org-20100430110359-ow3e3grh7sxy93pa
Remove more unused imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
132
132
 
133
133
    def completed(self, revno, rev_id):
134
134
        self._note('Committed revision %d.', revno)
135
 
        # self._note goes to the console too; so while we want to log the
136
 
        # rev_id, we can't trivially only log it. (See bug 526425). Long
137
 
        # term we should rearrange the reporting structure, but for now
138
 
        # we just mutter seperately. We mutter the revid and revno together
139
 
        # so that concurrent bzr invocations won't lead to confusion.
140
 
        mutter('Committed revid %s as revno %d.', rev_id, revno)
141
135
 
142
136
    def deleted(self, path):
143
137
        self._note('deleted %s', path)
227
221
            commit.
228
222
        """
229
223
        operation = OperationWithCleanups(self._commit)
230
 
        self.revprops = revprops or {}
231
 
        # XXX: Can be set on __init__ or passed in - this is a bit ugly.
232
 
        self.config = config or self.config
233
224
        return operation.run(
234
225
               message=message,
235
226
               timestamp=timestamp,
240
231
               allow_pointless=allow_pointless,
241
232
               strict=strict,
242
233
               verbose=verbose,
 
234
               revprops=revprops,
243
235
               working_tree=working_tree,
244
236
               local=local,
245
237
               reporter=reporter,
 
238
               config=config,
246
239
               message_callback=message_callback,
247
240
               recursive=recursive,
248
241
               exclude=exclude,
249
242
               possible_master_transports=possible_master_transports)
250
243
 
251
244
    def _commit(self, operation, message, timestamp, timezone, committer,
252
 
            specific_files, rev_id, allow_pointless, strict, verbose,
253
 
            working_tree, local, reporter, message_callback, recursive,
 
245
            specific_files, rev_id, allow_pointless, strict, verbose, revprops,
 
246
            working_tree, local, reporter, config, message_callback, recursive,
254
247
            exclude, possible_master_transports):
255
248
        mutter('preparing to commit')
256
249
 
291
284
            self.specific_files = None
292
285
            
293
286
        self.allow_pointless = allow_pointless
 
287
        self.revprops = revprops
294
288
        self.message_callback = message_callback
295
289
        self.timestamp = timestamp
296
290
        self.timezone = timezone
362
356
        # Collect the changes
363
357
        self._set_progress_stage("Collecting changes", counter=True)
364
358
        self.builder = self.branch.get_commit_builder(self.parents,
365
 
            self.config, timestamp, timezone, committer, self.revprops, rev_id)
 
359
            self.config, timestamp, timezone, committer, revprops, rev_id)
366
360
 
367
361
        try:
368
362
            self.builder.will_record_deletes()