← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branchbuilder.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-05 01:48:32 UTC
  • mto: This revision was merged to the branch mainline in revision 4410.
  • Revision ID: john@arbash-meinel.com-20090605014832-vxltjd08943mylqd
Fix the GPL header

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