← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-06-30 18:28:17 UTC
  • mfrom: (5967.10.2 test-cat)
  • Revision ID: pqm@pqm.ubuntu.com-20110630182817-83a5q9r9rxfkdn8r
(mbp) don't use subprocesses for testing cat (Martin Pool)

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
18
17
 
19
18
import errno
20
19
import re
83
82
            # when a tree root was deleted / renamed.
84
83
            if kind[0] is None and names[1] == '':
85
84
                continue
86
 
            # Also don't shelve deletion of tree root.
87
 
            if kind[1] is None and names[0] == '':
88
 
                continue
89
85
            if kind[0] is None or versioned[0] == False:
90
86
                self.creation[file_id] = (kind[1], names[1], parents[1],
91
87
                                          versioned)
125
121
            raise ValueError('Unknown change kind: "%s"' % change[0])
126
122
 
127
123
    def shelve_all(self):
128
 
        """Shelve all changes.
129
 
 
130
 
        :return: True if changes were shelved, False if there were no changes.
131
 
        """
132
 
        change = None
 
124
        """Shelve all changes."""
133
125
        for change in self.iter_shelvable():
134
126
            self.shelve_change(change)
135
 
        return change is not None
136
127
 
137
128
    def shelve_rename(self, file_id):
138
129
        """Shelve a file rename.
260
251
        """Shelve changes from working tree."""
261
252
        self.work_transform.apply()
262
253
 
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
 
 
271
254
    def write_shelf(self, shelf_file, message=None):
272
255
        """Serialize the shelved changes to a file.
273
256
 
276
259
        :return: the filename of the written file.
277
260
        """
278
261
        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):
285
262
        serializer = pack.ContainerSerialiser()
286
263
        shelf_file.write(serializer.begin())
287
 
        metadata = cls.metadata_record(serializer, revision_id, message)
288
 
        shelf_file.write(metadata)
289
 
        for bytes in transform.serialize(serializer):
 
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):
290
272
            shelf_file.write(bytes)
291
273
        shelf_file.write(serializer.end())
292
274