← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branchbuilder.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/branchbuilder.py
103
103
        finally:
104
104
            tree.unlock()
105
105
 
106
 
    def _do_commit(self, tree, message=None, **kwargs):
 
106
    def _do_commit(self, tree, message=None, message_callback=None, **kwargs):
107
107
        reporter = commit.NullCommitReporter()
108
 
        if message is None:
 
108
        if message is None and message_callback is None:
109
109
            message = u'commit %d' % (self._branch.revno() + 1,)
110
 
        return tree.commit(message,
 
110
        return tree.commit(message, message_callback=message_callback,
111
111
            reporter=reporter,
112
112
            **kwargs)
113
113
 
162
162
 
163
163
    def build_snapshot(self, revision_id, parent_ids, actions,
164
164
        message=None, timestamp=None, allow_leftmost_as_ghost=False,
165
 
        committer=None, timezone=None):
 
165
        committer=None, timezone=None, message_callback=None):
166
166
        """Build a commit, shaped in a specific way.
167
167
 
168
168
        :param revision_id: The handle for the new commit, can be None
175
175
            ('rename', ('orig-path', 'new-path'))
176
176
        :param message: An optional commit message, if not supplied, a default
177
177
            commit message will be written.
 
178
        :param message_callback: A message callback to use for the commit, as
 
179
            per mutabletree.commit.
178
180
        :param timestamp: If non-None, set the timestamp of the commit to this
179
181
            value.
180
182
        :param timezone: An optional timezone for timestamp.
244
246
            for file_id, content in new_contents.iteritems():
245
247
                tree.put_file_bytes_non_atomic(file_id, content)
246
248
            return self._do_commit(tree, message=message, rev_id=revision_id,
247
 
                timestamp=timestamp, timezone=timezone, committer=committer)
 
249
                timestamp=timestamp, timezone=timezone, committer=committer,
 
250
                message_callback=message_callback)
248
251
        finally:
249
252
            tree.unlock()
250
253