/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: Jelmer Vernooij
  • Date: 2019-07-07 17:22:07 UTC
  • mfrom: (7363 work)
  • mto: This revision was merged to the branch mainline in revision 7378.
  • Revision ID: jelmer@jelmer.uk-20190707172207-nnugeuwvxsxo62wa
merge trunk.

Show diffs side-by-side

added added

removed removed

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