← Back to branch summary

~ndurner/bzr/bzr-ftp

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-07-14 15:05:06 UTC
  • mfrom: (4526.6.15 merge-interactive)
  • Revision ID: pqm@pqm.ubuntu.com-20090714150506-zspaa7037mm7x9hi
(abentley) Implement merge --interactive

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
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
 
99
114
    def shelve_rename(self, file_id):
100
115
        """Shelve a file rename.
101
116