← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

Merge bzr.dev, update to use new hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
65
65
        """Iterable of tuples describing shelvable changes.
66
66
 
67
67
        As well as generating the tuples, this updates several members.
68
 
        Tuples may be:
 
68
        Tuples may be::
 
69
 
69
70
           ('add file', file_id, work_kind, work_path)
70
71
           ('delete file', file_id, target_kind, target_path)
71
72
           ('rename', file_id, target_path, work_path)
81
82
            # when a tree root was deleted / renamed.
82
83
            if kind[0] is None and names[1] == '':
83
84
                continue
 
85
            # Also don't shelve deletion of tree root.
 
86
            if kind[1] is None and names[0] == '':
 
87
                continue
84
88
            if kind[0] is None or versioned[0] == False:
85
89
                self.creation[file_id] = (kind[1], names[1], parents[1],
86
90
                                          versioned)