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

  • Committer: Aaron Bentley
  • Date: 2007-01-02 20:15:07 UTC
  • mto: (1551.9.35 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2237.
  • Revision ID: abentley@panoramicfeedback.com-20070102201507-zej9hrf5cxxjkypj
Get ls working on branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1560
1560
                                             ' and PATH')
1561
1561
            fs_path = path
1562
1562
            prefix = path
1563
 
        tree, relpath = WorkingTree.open_containing(fs_path)
 
1563
        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
 
1564
            fs_path)
1564
1565
        if from_root:
1565
1566
            relpath = u''
1566
1567
        elif relpath:
1567
1568
            relpath += '/'
1568
1569
        if revision is not None:
1569
 
            tree = tree.branch.repository.revision_tree(
1570
 
                revision[0].in_history(tree.branch).rev_id)
 
1570
            tree = branch.repository.revision_tree(
 
1571
                revision[0].in_history(branch).rev_id)
 
1572
        elif tree is None:
 
1573
            tree = branch.basis_tree()
1571
1574
 
1572
1575
        for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
1573
1576
            if fp.startswith(relpath):