← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Changed tree root parent to ROOT_PARENT

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
3
3
from bzrlib.osutils import file_kind, supports_executable
4
4
from bzrlib.inventory import InventoryEntry
5
5
import errno
 
6
 
 
7
ROOT_PARENT = "root-parent"
 
8
 
6
9
def unique_add(map, key, value):
7
10
    if key in map:
8
11
        raise DuplicateKey(key=key)
76
79
        return self._tree_path_ids[path]
77
80
 
78
81
    def get_tree_parent(self, trans_id):
79
 
        """Determine id of the parent in the tree, or None for tree root."""
 
82
        """Determine id of the parent in the tree."""
80
83
        path = self._tree_id_paths[trans_id]
81
84
        if path == "":
82
 
            return None
 
85
            return ROOT_PARENT
83
86
        return self.get_tree_path_id(os.path.dirname(path))
84
87
 
85
88
    def create_file(self, contents, trans_id):
174
177
        """\
175
178
        Determine the parent file_id, after any changes are applied.
176
179
 
177
 
        None is returned for the tree root.
 
180
        ROOT_PARENT is returned for the tree root.
178
181
        """
179
182
        try:
180
183
            return self._new_parent[trans_id]
204
207
        for trans_id in self._new_parent:
205
208
            seen = set()
206
209
            parent_id = trans_id
207
 
            while parent_id is not None:
 
210
            while parent_id is not ROOT_PARENT:
208
211
                seen.add(parent_id)
209
212
                parent_id = self.final_parent(parent_id)
210
213
                if parent_id == trans_id: