/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to tree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-26 01:35:39 UTC
  • mto: (0.200.1934 work)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180326013539-coyryzyl3h156wy3
Remove revision.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tree.py
180
180
 
181
181
class GitTreeSubmodule(_mod_tree.TreeLink):
182
182
 
183
 
    __slots__ = ['file_id', 'name', 'parent_id', 'revision', 'reference_revision']
 
183
    __slots__ = ['file_id', 'name', 'parent_id', 'reference_revision']
184
184
 
185
 
    def __init__(self, file_id, name, parent_id, revision=None,
186
 
                 reference_revision=None):
 
185
    def __init__(self, file_id, name, parent_id, reference_revision=None):
187
186
        self.file_id = file_id
188
187
        self.name = name
189
188
        self.parent_id = parent_id
190
 
        self.revision = revision
191
189
        self.reference_revision = reference_revision
192
190
 
193
191
    @property
195
193
        return 'tree-reference'
196
194
 
197
195
    def __repr__(self):
198
 
        return "%s(file_id=%r, name=%r, parent_id=%r, revision=%r, reference_revision=%r)" % (
 
196
        return "%s(file_id=%r, name=%r, parent_id=%r, reference_revision=%r)" % (
199
197
            type(self).__name__, self.file_id, self.name, self.parent_id,
200
 
            self.revision, self.reference_revision)
 
198
            self.reference_revision)
201
199
 
202
200
    def __eq__(self, other):
203
201
        return (self.kind == other.kind and
204
202
                self.file_id == other.file_id and
205
203
                self.name == other.name and
206
204
                self.parent_id == other.parent_id and
207
 
                self.revision == other.revision and
208
205
                self.reference_revision == other.reference_revision)
209
206
 
210
207
    def copy(self):
211
208
        return self.__class__(
212
209
                self.file_id, self.name, self.parent_id,
213
 
                self.revision, self.reference_revision)
 
210
                self.reference_revision)
214
211
 
215
212
 
216
213
entry_factory = {
945
942
                    for (dir_path, dir_ie) in self._add_missing_parent_ids(parent,
946
943
                            dir_ids):
947
944
                        ret[(posixpath.dirname(dir_path), dir_path)] = dir_ie
 
945
                file_ie.parent_id = self.path2id(parent)
948
946
                ret[(posixpath.dirname(path), path)] = file_ie
949
947
            return ((path, ie) for ((_, path), ie) in sorted(ret.items()))
950
948
 
1142
1140
                    (to_index, to_subpath) = self._lookup_index(posixpath.join(to_path, posixpath.relpath(p, from_path)))
1143
1141
                    to_index[to_subpath] = from_value
1144
1142
                    # TODO(jelmer): Handle submodules
1145
 
                    del self.index[p]
 
1143
                    del self.index[from_subpath]
1146
1144
 
1147
1145
            self._versioned_dirs = None
1148
1146
            self.flush()