/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/rewrite/rebase.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/rewrite/rebase.py
16
16
 
17
17
"""Rebase."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
import os
22
20
 
23
21
from ... import (
32
30
    UnrelatedBranches,
33
31
    )
34
32
from ...bzr.generate_ids import gen_revision_id
 
33
from ...bzr.inventorytree import InventoryTreeChange
35
34
from ...graph import FrozenHeadsCache
36
35
from ...merge import Merger
37
36
from ...revision import NULL_REVISION
38
37
from ...trace import mutter
39
38
from ...tsort import topo_sort
40
 
from ...tree import TreeChange
41
39
from ... import ui
42
40
 
43
41
from .maptree import (
391
389
            new_parent = map_tree.new_id(change.parent_id[1])
392
390
        else:
393
391
            new_parent = change.parent_id[1]
394
 
        yield TreeChange(
 
392
        yield InventoryTreeChange(
395
393
            map_tree.new_id(change.file_id), change.path,
396
394
            change.changed_content, change.versioned,
397
395
            (old_parent, new_parent), change.name, change.kind,