/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/transform.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-06-22 14:42:20 UTC
  • mfrom: (7350.6.9 objects-2c)
  • Revision ID: breezy.the.bot@gmail.com-20190622144220-721zu03vr3y8tz9l
Drop file_id attribute from MergeHookParams and Tree.plan_file_merge.

Merged from https://code.launchpad.net/~jelmer/brz/objects-2c/+merge/368932

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
2675
2675
                            divert.add(file_id)
2676
2676
                    if (file_id not in divert
2677
2677
                        and _content_match(
2678
 
                            tree, entry, tree_path, file_id, kind,
2679
 
                            target_path)):
 
2678
                            tree, entry, tree_path, kind, target_path)):
2680
2679
                        tt.delete_contents(tt.trans_id_tree_path(tree_path))
2681
2680
                        if kind == 'directory':
2682
2681
                            reparent = True
2785
2784
    return by_parent[old_parent]
2786
2785
 
2787
2786
 
2788
 
def _content_match(tree, entry, tree_path, file_id, kind, target_path):
 
2787
def _content_match(tree, entry, tree_path, kind, target_path):
2789
2788
    if entry.kind != kind:
2790
2789
        return False
2791
2790
    if entry.kind == "directory":