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

  • Committer: Jelmer Vernooij
  • Date: 2017-11-12 20:07:32 UTC
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171112200732-ehxgen03s9jphe8n
Swap arguments for get_symlink_target and kind/stored_kind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
1050
1050
                into_existing = False
1051
1051
            else:
1052
1052
                # 'fix' the case of a potential 'from'
1053
 
                from_id = tree.path2id(
1054
 
                            tree.get_canonical_inventory_path(rel_names[0]))
 
1053
                from_path = tree.get_canonical_inventory_path(rel_names[0])
 
1054
                from_id = tree.path2id(from_path)
1055
1055
                if (not osutils.lexists(names_list[0]) and
1056
 
                    from_id and tree.stored_kind(from_id) == "directory"):
 
1056
                    from_id and
 
1057
                    tree.stored_kind(from_path, from_id) == "directory"):
1057
1058
                    into_existing = False
1058
1059
        # move/rename
1059
1060
        if into_existing:
4697
4698
                if file_id is None:
4698
4699
                    raise errors.NotVersionedError(filename)
4699
4700
                interesting_ids.add(file_id)
4700
 
                if tree.kind(file_id) != "directory":
 
4701
                if tree.kind(filename, file_id) != "directory":
4701
4702
                    continue
4702
4703
 
4703
4704
                # FIXME: Support nested trees