/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: John Arbash Meinel
  • Date: 2005-07-13 21:25:14 UTC
  • mto: (1185.11.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050713212514-052c682a28c163bb
Restoring compatibility for Storage.add(file, fileid), it is a little arbitrary, and compatibility is better

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
123
123
        inv_tmp = tempfile.TemporaryFile()
124
124
        pack_xml(new_inv, inv_tmp)
125
125
        inv_tmp.seek(0)
126
 
        branch.inventory_store.add(inv_id, inv_tmp)
 
126
        branch.inventory_store.add(inv_tmp, inv_id)
127
127
        mutter('new inventory_id is {%s}' % inv_id)
128
128
 
129
129
        # We could also just sha hash the inv_tmp file
162
162
        rev_tmp = tempfile.TemporaryFile()
163
163
        pack_xml(rev, rev_tmp)
164
164
        rev_tmp.seek(0)
165
 
        branch.revision_store.add(rev_id, rev_tmp)
 
165
        branch.revision_store.add(rev_tmp, rev_id)
166
166
        mutter("new revision_id is {%s}" % rev_id)
167
167
 
168
168
        ## XXX: Everything up to here can simply be orphaned if we abort
289
289
                entry.text_size = len(content)
290
290
 
291
291
                entry.text_id = gen_file_id(entry.name)
292
 
                branch.text_store.add(entry.text_id, content)
 
292
                branch.text_store.add(content, entry.text_id)
293
293
                mutter('    stored with text_id {%s}' % entry.text_id)
294
294
 
295
295
        if verbose: