← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Aaron Bentley
  • Date: 2012-07-13 15:21:51 UTC
  • mto: This revision was merged to the branch mainline in revision 6540.
  • Revision ID: aaron@aaronbentley.com-20120713152151-3y320wlqxndxibta
Implement branch.get_uncommitted_data.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
260
260
        """Shelve changes from working tree."""
261
261
        self.work_transform.apply()
262
262
 
 
263
    @staticmethod
 
264
    def metadata_record(serializer, revision_id, message=None):
 
265
        metadata = {'revision_id': revision_id}
 
266
        if message is not None:
 
267
            metadata['message'] = message.encode('utf-8')
 
268
        return serializer.bytes_record(
 
269
            bencode.bencode(metadata), (('metadata',),))
 
270
 
263
271
    def write_shelf(self, shelf_file, message=None):
264
272
        """Serialize the shelved changes to a file.
265
273
 
270
278
        transform.resolve_conflicts(self.shelf_transform)
271
279
        serializer = pack.ContainerSerialiser()
272
280
        shelf_file.write(serializer.begin())
273
 
        metadata = {
274
 
            'revision_id': self.target_tree.get_revision_id(),
275
 
        }
276
 
        if message is not None:
277
 
            metadata['message'] = message.encode('utf-8')
278
 
        shelf_file.write(serializer.bytes_record(
279
 
            bencode.bencode(metadata), (('metadata',),)))
 
281
        revision_id = self.target_tree.get_revision_id()
 
282
        metadata = self.metadata_record(serializer, revision_id, message)
 
283
        shelf_file.write(metadata)
280
284
        for bytes in self.shelf_transform.serialize(serializer):
281
285
            shelf_file.write(bytes)
282
286
        shelf_file.write(serializer.end())