/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/branchbuilder.py

  • Committer: Ian Clatworthy
  • Date: 2009-07-13 06:04:28 UTC
  • mfrom: (4527 +trunk)
  • mto: (4527.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4529.
  • Revision ID: ian.clatworthy@canonical.com-20090713060428-5m6apiywie6aqg6v
merge bzr.dev r4527

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branchbuilder.py
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):
 
164
        message=None, timestamp=None, allow_leftmost_as_ghost=False,
 
165
        committer=None):
165
166
        """Build a commit, shaped in a specific way.
166
167
 
167
168
        :param revision_id: The handle for the new commit, can be None
176
177
            commit message will be written.
177
178
        :param timestamp: If non-None, set the timestamp of the commit to this
178
179
            value.
 
180
        :param committer: An optional username to use for commit
179
181
        :param allow_leftmost_as_ghost: True if the leftmost parent should be
180
182
            permitted to be a ghost.
181
183
        :return: The revision_id of the new commit
241
243
            for file_id, content in new_contents.iteritems():
242
244
                tree.put_file_bytes_non_atomic(file_id, content)
243
245
            return self._do_commit(tree, message=message, rev_id=revision_id,
244
 
                timestamp=timestamp)
 
246
                timestamp=timestamp, committer=committer)
245
247
        finally:
246
248
            tree.unlock()
247
249