/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: 2017-11-12 14:19:13 UTC
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171112141913-ppojmnq7k7n3kuv2
Swap arguments for Tree.is_executable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/transform.py
2038
2038
            executable = False
2039
2039
        else:
2040
2040
            file_id = self._transform.final_file_id(self._path2trans_id(path))
2041
 
            executable = self.is_executable(file_id, path)
 
2041
            executable = self.is_executable(path, file_id)
2042
2042
        return kind, executable, None
2043
2043
 
2044
2044
    def is_locked(self):
2289
2289
            finally:
2290
2290
                fileobj.close()
2291
2291
 
2292
 
    def is_executable(self, file_id, path=None):
 
2292
    def is_executable(self, path, file_id=None):
 
2293
        if file_id is None:
 
2294
            file_id = self.path2id(path)
2293
2295
        if file_id is None:
2294
2296
            return False
2295
2297
        trans_id = self._transform.trans_id_file_id(file_id)
2297
2299
            return self._transform._new_executability[trans_id]
2298
2300
        except KeyError:
2299
2301
            try:
2300
 
                return self._transform._tree.is_executable(file_id, path)
 
2302
                return self._transform._tree.is_executable(path, file_id)
2301
2303
            except OSError as e:
2302
2304
                if e.errno == errno.ENOENT:
2303
2305
                    return False
2615
2617
                    trans_id = tt.create_path(entry.name, parent_id)
2616
2618
                    file_trans_id[file_id] = trans_id
2617
2619
                    tt.version_file(file_id, trans_id)
2618
 
                    executable = tree.is_executable(file_id, tree_path)
 
2620
                    executable = tree.is_executable(tree_path, file_id)
2619
2621
                    if executable:
2620
2622
                        tt.set_executability(executable, trans_id)
2621
2623
                    trans_data = (trans_id, tree_path, entry.text_sha1)
2622
2624
                    deferred_contents.append((file_id, trans_data))
2623
2625
                else:
2624
 
                    file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
2625
 
                                                          tree)
 
2626
                    file_trans_id[file_id] = new_by_entry(
 
2627
                            tt, entry, parent_id, tree)
2626
2628
                if reparent:
2627
2629
                    new_trans_id = file_trans_id[file_id]
2628
2630
                    old_parent = tt.trans_id_tree_path(tree_path)
2765
2767
    return new_conflicts
2766
2768
 
2767
2769
 
2768
 
def new_by_entry(tt, entry, parent_id, tree):
 
2770
def new_by_entry(path, tt, entry, parent_id, tree):
2769
2771
    """Create a new file according to its inventory entry"""
2770
2772
    name = entry.name
2771
2773
    kind = entry.kind
2772
2774
    if kind == 'file':
2773
2775
        contents = tree.get_file(entry.file_id).readlines()
2774
 
        executable = tree.is_executable(entry.file_id)
 
2776
        executable = tree.is_executable(path, entry.file_id)
2775
2777
        return tt.new_file(name, parent_id, contents, entry.file_id,
2776
2778
                           executable)
2777
2779
    elif kind in ('directory', 'tree-reference'):