← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Patch Queue Manager
  • Date: 2013-07-14 10:59:28 UTC
  • mfrom: (6579.2.1 1195783-platform-utf8)
  • Revision ID: pqm@pqm.ubuntu.com-20130714105928-78j748r1djstxmo1
(vila) Make 'bzr version' support utf8 platform names. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
17
18
 
18
19
import errno
19
20
import re
82
83
            # when a tree root was deleted / renamed.
83
84
            if kind[0] is None and names[1] == '':
84
85
                continue
 
86
            # Also don't shelve deletion of tree root.
 
87
            if kind[1] is None and names[0] == '':
 
88
                continue
85
89
            if kind[0] is None or versioned[0] == False:
86
90
                self.creation[file_id] = (kind[1], names[1], parents[1],
87
91
                                          versioned)
121
125
            raise ValueError('Unknown change kind: "%s"' % change[0])
122
126
 
123
127
    def shelve_all(self):
124
 
        """Shelve all changes."""
 
128
        """Shelve all changes.
 
129
 
 
130
        :return: True if changes were shelved, False if there were no changes.
 
131
        """
 
132
        change = None
125
133
        for change in self.iter_shelvable():
126
134
            self.shelve_change(change)
 
135
        return change is not None
127
136
 
128
137
    def shelve_rename(self, file_id):
129
138
        """Shelve a file rename.
251
260
        """Shelve changes from working tree."""
252
261
        self.work_transform.apply()
253
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
 
254
271
    def write_shelf(self, shelf_file, message=None):
255
272
        """Serialize the shelved changes to a file.
256
273
 
259
276
        :return: the filename of the written file.
260
277
        """
261
278
        transform.resolve_conflicts(self.shelf_transform)
 
279
        revision_id = self.target_tree.get_revision_id()
 
280
        return self._write_shelf(shelf_file, self.shelf_transform, revision_id,
 
281
                                 message)
 
282
 
 
283
    @classmethod
 
284
    def _write_shelf(cls, shelf_file, transform, revision_id, message=None):
262
285
        serializer = pack.ContainerSerialiser()
263
286
        shelf_file.write(serializer.begin())
264
 
        metadata = {
265
 
            'revision_id': self.target_tree.get_revision_id(),
266
 
        }
267
 
        if message is not None:
268
 
            metadata['message'] = message.encode('utf-8')
269
 
        shelf_file.write(serializer.bytes_record(
270
 
            bencode.bencode(metadata), (('metadata',),)))
271
 
        for bytes in self.shelf_transform.serialize(serializer):
 
287
        metadata = cls.metadata_record(serializer, revision_id, message)
 
288
        shelf_file.write(metadata)
 
289
        for bytes in transform.serialize(serializer):
272
290
            shelf_file.write(bytes)
273
291
        shelf_file.write(serializer.end())
274
292