← 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-04 21:09:51 UTC
  • mto: This revision was merged to the branch mainline in revision 4469.
  • Revision ID: john@arbash-meinel.com-20090604210951-5mxlt1h8p4xdh6pl
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.

Commit won't be using parent_texts or left_matching_blocks or check_content.
And for something like fast-import, it will be tuned for GC repositories anyway,
and there we don't need parent_texts anyway.

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,
165
 
        committer=None, timezone=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
177
176
            commit message will be written.
178
177
        :param timestamp: If non-None, set the timestamp of the commit to this
179
178
            value.
180
 
        :param timezone: An optional timezone for timestamp.
181
 
        :param committer: An optional username to use for commit
182
179
        :param allow_leftmost_as_ghost: True if the leftmost parent should be
183
180
            permitted to be a ghost.
184
181
        :return: The revision_id of the new commit
244
241
            for file_id, content in new_contents.iteritems():
245
242
                tree.put_file_bytes_non_atomic(file_id, content)
246
243
            return self._do_commit(tree, message=message, rev_id=revision_id,
247
 
                timestamp=timestamp, timezone=timezone, committer=committer)
 
244
                timestamp=timestamp)
248
245
        finally:
249
246
            tree.unlock()
250
247