← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-05 15:31:34 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090505153134-q4bp4is9gywsmzrv
Clean up test for log formats.

* bzrlib/tests/blackbox/test_logformats.py:
Update tests to actual style.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
19
19
import re
20
20
 
21
21
from bzrlib import (
22
 
    bencode,
23
22
    errors,
24
23
    merge,
25
24
    merge3,
29
28
    ui,
30
29
    workingtree,
31
30
)
 
31
from bzrlib.util import bencode
32
32
 
33
33
 
34
34
class ShelfCreator(object):
96
96
                elif changed:
97
97
                    yield ('modify text', file_id)
98
98
 
99
 
    def shelve_change(self, change):
100
 
        """Shelve a change in the iter_shelvable format."""
101
 
        if change[0] == 'rename':
102
 
            self.shelve_rename(change[1])
103
 
        elif change[0] == 'delete file':
104
 
            self.shelve_deletion(change[1])
105
 
        elif change[0] == 'add file':
106
 
            self.shelve_creation(change[1])
107
 
        elif change[0] == 'change kind':
108
 
            self.shelve_content_change(change[1])
109
 
        elif change[0] == 'modify target':
110
 
            self.shelve_modify_target(change[1])
111
 
        else:
112
 
            raise ValueError('Unknown change kind: "%s"' % change[0])
113
 
 
114
99
    def shelve_rename(self, file_id):
115
100
        """Shelve a file rename.
116
101