/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 breezy/plugins/fastimport/revision_store.py

  • Committer: Jelmer Vernooij
  • Date: 2020-08-10 15:00:17 UTC
  • mfrom: (7490.40.99 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200810150017-vs7xnrd1vat4iktg
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/fastimport/revision_store.py
23
23
    osutils,
24
24
    revision as _mod_revision,
25
25
    )
26
 
from ...tree import TreeChange
 
26
from ...bzr.inventorytree import InventoryTreeChange
27
27
from ...bzr import (
28
28
    inventory,
29
29
    )
117
117
                old_ie = None
118
118
                if ie is None:
119
119
                    raise AssertionError('How is both old and new None?')
120
 
                    change = TreeChange(
 
120
                    change = InventoryTreeChange(
121
121
                        file_id,
122
122
                        (old_path, new_path),
123
123
                        False,
127
127
                        (None, None),
128
128
                        (None, None),
129
129
                        )
130
 
                change = TreeChange(
 
130
                change = InventoryTreeChange(
131
131
                    file_id,
132
132
                    (old_path, new_path),
133
133
                    True,
139
139
                    )
140
140
            else:
141
141
                if ie is None:
142
 
                    change = TreeChange(
 
142
                    change = InventoryTreeChange(
143
143
                        file_id,
144
144
                        (old_path, new_path),
145
145
                        True,
154
154
                                        ie.text_size != old_ie.text_size)
155
155
                    # TODO: ie.kind != old_ie.kind
156
156
                    # TODO: symlinks changing targets, content_modified?
157
 
                    change = TreeChange(
 
157
                    change = InventoryTreeChange(
158
158
                        file_id,
159
159
                        (old_path, new_path),
160
160
                        content_modified,