/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: Vincent Ladeuil
  • Date: 2010-02-11 09:21:45 UTC
  • mto: (5029.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5030.
  • Revision ID: v.ladeuil+lp@free.fr-20100211092145-drh33z43szccfswy
Move MemoryServer back into bzrlib.transport.memory as it's needed as soon as a MemoryTransport is used. Add a NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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)
156
150
 
157
151
    def deleted(self, path):
158
152
        self._note('deleted %s', path)
242
236
            commit.
243
237
        """
244
238
        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
248
239
        return operation.run(
249
240
               message=message,
250
241
               timestamp=timestamp,
255
246
               allow_pointless=allow_pointless,
256
247
               strict=strict,
257
248
               verbose=verbose,
 
249
               revprops=revprops,
258
250
               working_tree=working_tree,
259
251
               local=local,
260
252
               reporter=reporter,
 
253
               config=config,
261
254
               message_callback=message_callback,
262
255
               recursive=recursive,
263
256
               exclude=exclude,
264
257
               possible_master_transports=possible_master_transports)
265
258
 
266
259
    def _commit(self, operation, message, timestamp, timezone, committer,
267
 
            specific_files, rev_id, allow_pointless, strict, verbose,
268
 
            working_tree, local, reporter, message_callback, recursive,
 
260
            specific_files, rev_id, allow_pointless, strict, verbose, revprops,
 
261
            working_tree, local, reporter, config, message_callback, recursive,
269
262
            exclude, possible_master_transports):
270
263
        mutter('preparing to commit')
271
264
 
306
299
            self.specific_files = None
307
300
            
308
301
        self.allow_pointless = allow_pointless
 
302
        self.revprops = revprops
309
303
        self.message_callback = message_callback
310
304
        self.timestamp = timestamp
311
305
        self.timezone = timezone
377
371
        # Collect the changes
378
372
        self._set_progress_stage("Collecting changes", counter=True)
379
373
        self.builder = self.branch.get_commit_builder(self.parents,
380
 
            self.config, timestamp, timezone, committer, self.revprops, rev_id)
 
374
            self.config, timestamp, timezone, committer, revprops, rev_id)
381
375
 
382
376
        try:
383
377
            self.builder.will_record_deletes()