/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:35:43 UTC
  • mfrom: (5195 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5197.
  • Revision ID: jelmer@samba.org-20100430113543-tiqqhmqa3d8no4iu
merge bzr.dev

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)
135
141
 
136
142
    def deleted(self, path):
137
143
        self._note('deleted %s', path)
221
227
            commit.
222
228
        """
223
229
        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
224
233
        return operation.run(
225
234
               message=message,
226
235
               timestamp=timestamp,
231
240
               allow_pointless=allow_pointless,
232
241
               strict=strict,
233
242
               verbose=verbose,
234
 
               revprops=revprops,
235
243
               working_tree=working_tree,
236
244
               local=local,
237
245
               reporter=reporter,
238
 
               config=config,
239
246
               message_callback=message_callback,
240
247
               recursive=recursive,
241
248
               exclude=exclude,
242
249
               possible_master_transports=possible_master_transports)
243
250
 
244
251
    def _commit(self, operation, message, timestamp, timezone, committer,
245
 
            specific_files, rev_id, allow_pointless, strict, verbose, revprops,
246
 
            working_tree, local, reporter, config, message_callback, recursive,
 
252
            specific_files, rev_id, allow_pointless, strict, verbose,
 
253
            working_tree, local, reporter, message_callback, recursive,
247
254
            exclude, possible_master_transports):
248
255
        mutter('preparing to commit')
249
256
 
284
291
            self.specific_files = None
285
292
            
286
293
        self.allow_pointless = allow_pointless
287
 
        self.revprops = revprops
288
294
        self.message_callback = message_callback
289
295
        self.timestamp = timestamp
290
296
        self.timezone = timezone
356
362
        # Collect the changes
357
363
        self._set_progress_stage("Collecting changes", counter=True)
358
364
        self.builder = self.branch.get_commit_builder(self.parents,
359
 
            self.config, timestamp, timezone, committer, revprops, rev_id)
 
365
            self.config, timestamp, timezone, committer, self.revprops, rev_id)
360
366
 
361
367
        try:
362
368
            self.builder.will_record_deletes()