/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: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-03-24 00:53:02 UTC
  • mfrom: (6883.7.16 cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20180324005302-z0eh8ftsz57804cg
Avoid using file ids in a couple more places.

Merged from https://code.launchpad.net/~jelmer/brz/cleanups/+merge/341360

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
1129
1129
            else:
1130
1130
                # 'fix' the case of a potential 'from'
1131
1131
                from_path = tree.get_canonical_inventory_path(rel_names[0])
1132
 
                from_id = tree.path2id(from_path)
1133
1132
                if (not osutils.lexists(names_list[0]) and
1134
 
                    from_id and
1135
 
                    tree.stored_kind(from_path, from_id) == "directory"):
 
1133
                    tree.is_versioned(from_path) and
 
1134
                    tree.stored_kind(from_path) == "directory"):
1136
1135
                    into_existing = False
1137
1136
        # move/rename
1138
1137
        if into_existing:
6775
6774
    __doc__ = """Export command helps and error messages in po format."""
6776
6775
 
6777
6776
    hidden = True
6778
 
    takes_options = [Option('plugin', 
 
6777
    takes_options = [Option('plugin',
6779
6778
                            help='Export help text from named command '\
6780
6779
                                 '(defaults to all built in commands).',
6781
6780
                            type=text_type),