Merge lp:~garyvdm/bzr/bug492116-ls-file into lp:bzr

[Gary van der Merwe]

This makes ``bzr ls FILE`` list the file passed, similar to how GNU coreutils ``ls`` behaves.

To achieve this, I changed the behavior of the ``Tree.list_files`` methods so that if passed a file, they will yield just the file.

I originally hoped that this would not be necessary, and that I could just make the necessary changes in ``builtins.cmd_ls``, but this was difficult because that would require logic to get a inventory entry, which for a wt is non-trivial. Hence, I decided to change the behavior ``Tree.list_files``.

A possible alternative to this is:
The inventory entry is only used in builtins.cmd_ls to get a entry.kind_character(), so maybe it would be easier if i were to add a tree.kind_character() method, and then I could get every thing I needed in builtins.cmd_ls with out calling Tree.list_files.

[Vincent Ladeuil (vila)]

This looks good !

I've fixed a couple of minor issues while I was reviewing it (lp:~vila/bzr/bug492116-ls-file), you may want to integrate them:
- yes, root is always a dir,
- don't use os.path when we have an osutils function for it,
- a couple of typos ;)
- some test code duplication.

On the overall, I'm a bit worried of the code duplication there, but you're not responsible for it for the most part so it's probably out of scope to fix them here. BUT, your proposed alternative may avoid to add more of it so may be it would be better to try to add the tree.kind_character method.

[Andrew King (eurokang)]

This also fixes a traceback I was going to report, which is bzr ls -rREV someFile.

[John A Meinel (jameinel)]

Putting this back to Needs Review because Gary pulled in Vincent's work, and I don't know where it stands at this point.

[Jelmer Vernooij (jelmer)]

This patch probably needs a bit of extra work as there are now conflicts. Gary, are you still planning to work on this?

[Jelmer Vernooij (jelmer)]

Superseded by https://code.launchpad.net/~jelmer/bzr/bug592116-ls-file/+merge/59803

Unmerged revisions

5590. By Vincent Ladeuil on 2011-01-12

Fix typo.

5589. By Vincent Ladeuil on 2011-01-12

Yes, root is always a dir, use osutils instead of os.path, fix typo, remove commented out debugger call.

5588. By Vincent Ladeuil on 2011-01-12

Remove debugger call.

5587. By Vincent Ladeuil on 2011-01-12

Remove duplicated code in tests.

5586. By Vincent Ladeuil on 2011-01-12

Replace try/finally by addCleanup.

5585. By Gary van der Merwe on 2011-01-10

Make ``bzr ls FILE`` list the file passed, simillar to how GNU coreutils ``ls`` behaves.

5584. By Gary van der Merwe on 2011-01-10

Test ``Tree.list_files(from_dir=...) does deprecated warning.

5583. By Gary van der Merwe on 2011-01-10

Change all ``Tree.list_files`` methods so that if passed a file, rather than a directory, they will yield just the file.

In order to represent this, the ``from_dir`` argument has been renamed to ``from_path``, and the ``from_dir`` argument is deprecated.

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2011-01-12 01:01:53 +0000
+++ bzrlib/builtins.py	2011-01-13 07:27:10 +0000
@@ -2579,28 +2579,33 @@
         tree, branch, relpath = \
             _open_directory_or_containing_tree_or_branch(fs_path, directory)
 
+        if revision is not None or tree is None:
+            tree = _get_one_revision_tree('ls', revision, branch=branch)
+
+        apply_view = False
+        if isinstance(tree, WorkingTree) and tree.supports_views():
+            view_files = tree.views.lookup_view()
+            if view_files:
+                apply_view = True
+                view_str = views.view_display_str(view_files)
+                note("Ignoring files outside view. View is %s" % view_str)
+
+        self.add_cleanup(tree.lock_read().unlock)
+
         # Calculate the prefix to use
         prefix = None
         if from_root:
             if relpath:
                 prefix = relpath + '/'
-        elif fs_path != '.' and not fs_path.endswith('/'):
-            prefix = fs_path + '/'
-
-        if revision is not None or tree is None:
-            tree = _get_one_revision_tree('ls', revision, branch=branch)
-
-        apply_view = False
-        if isinstance(tree, WorkingTree) and tree.supports_views():
-            view_files = tree.views.lookup_view()
-            if view_files:
-                apply_view = True
-                view_str = views.view_display_str(view_files)
-                note("Ignoring files outside view. View is %s" % view_str)
-
-        self.add_cleanup(tree.lock_read().unlock)
+        else:
+            if tree.path_content_summary(relpath)[0] == 'directory':
+                if fs_path != '.' and not fs_path.endswith('/'):
+                    prefix = fs_path + '/'
+            else:
+                prefix = os.path.split(fs_path)[0]
+        
         for fp, fc, fkind, fid, entry in tree.list_files(include_root=False,
-            from_dir=relpath, recursive=recursive):
+            from_path=relpath, recursive=recursive):
             # Apply additional masking
             if not all and not selection[fc]:
                 continue

=== modified file 'bzrlib/revisiontree.py'
--- bzrlib/revisiontree.py	2010-11-29 23:35:13 +0000
+++ bzrlib/revisiontree.py	2011-01-13 07:27:10 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2010 Canonical Ltd
+# Copyright (C) 2006-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -20,8 +20,10 @@
 
 from bzrlib import (
     errors,
+    osutils,
     revision,
     tree,
+    symbol_versioning,
     )
 
 
@@ -116,22 +118,37 @@
     def has_filename(self, filename):
         return bool(self.inventory.path2id(filename))
 
-    def list_files(self, include_root=False, from_dir=None, recursive=True):
+    def list_files(self, include_root=False, from_path=None, recursive=True,
+                   from_dir=symbol_versioning.DEPRECATED_PARAMETER):
+        if symbol_versioning.deprecated_passed(from_dir):
+            symbol_versioning.warn(symbol_versioning.deprecated_in((2,3,0)) %
+                 '"from_dir" parameter to Tree.list_files()'
+                 ' Use Tree.list_files(from_path=) instead.',
+                 DeprecationWarning, stacklevel=2)
+            from_path=from_dir
         # The only files returned by this are those from the version
         inv = self.inventory
-        if from_dir is None:
-            from_dir_id = None
+        if from_path is None:
+            from_path_id = None
+            from_path_kind = 'directory'
         else:
-            from_dir_id = inv.path2id(from_dir)
-            if from_dir_id is None:
-                # Directory not versioned
+            from_path_id = inv.path2id(from_path)
+            if from_path_id is None:
+                # Path not versioned
                 return
-        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
-        if inv.root is not None and not include_root and from_dir is None:
-            # skip the root for compatability with the current apis.
-            entries.next()
-        for path, entry in entries:
-            yield path, 'V', entry.kind, entry.file_id, entry
+            from_path_kind = self.kind(from_path_id)
+        if from_path_kind == 'directory':
+            entries = inv.iter_entries(from_dir=from_path_id,
+                                       recursive=recursive)
+            if inv.root is not None and not include_root and from_path is None:
+                # skip the root for compatibility with the current apis.
+                entries.next()
+            for path, entry in entries:
+                yield path, 'V', entry.kind, entry.file_id, entry
+        else:
+            entry = inv[from_path_id]
+            file_path = osutils.split(from_path)[1]
+            yield file_path, 'V', from_path_kind, from_path_id, entry
 
     def get_symlink_target(self, file_id):
         ie = self._inventory[file_id]

=== modified file 'bzrlib/tests/__init__.py'
=== modified file 'bzrlib/tests/blackbox/test_ls.py'
--- bzrlib/tests/blackbox/test_ls.py	2010-05-02 20:10:25 +0000
+++ bzrlib/tests/blackbox/test_ls.py	2011-01-13 07:27:10 +0000
@@ -141,8 +141,12 @@
         """If a path is specified, files are listed with that prefix"""
         self.build_tree(['subdir/', 'subdir/b'])
         self.wt.add(['subdir', 'subdir/b'])
+        self.ls_equals('a\n',
+                       'a')
         self.ls_equals('subdir/b\n' ,
                        'subdir')
+        self.ls_equals('subdir/b\n' ,
+                       'subdir/b')
         os.chdir('subdir')
         self.ls_equals('../.bzrignore\n'
                        '../a\n'

=== modified file 'bzrlib/tests/per_tree/test_list_files.py'
--- bzrlib/tests/per_tree/test_list_files.py	2009-07-10 07:14:02 +0000
+++ bzrlib/tests/per_tree/test_list_files.py	2011-01-13 07:27:10 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 Canonical Ltd
+# Copyright (C) 2007, 2009, 2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,101 +16,75 @@
 
 """Test that all trees support Tree.list_files()"""
 
+from bzrlib import symbol_versioning
 from bzrlib.tests.per_tree import TestCaseWithTree
 
 
 class TestListFiles(TestCaseWithTree):
 
+    def setUp(self):
+        super(TestListFiles, self).setUp()
+        work_tree = self.make_branch_and_tree('wt')
+        self.tree = self.get_tree_no_parents_abc_content(work_tree)
+
+    def assertListFiles(self, expected, **kwargs):
+        self.tree.lock_read()
+        self.addCleanup(self.tree.unlock)
+        actual = [(path, status, kind, file_id)
+                  for path, status, kind, file_id, ie in
+                  self.tree.list_files(**kwargs)]
+        self.assertEqual(expected, actual)
+
     def test_list_files_with_root(self):
-        work_tree = self.make_branch_and_tree('wt')
-        tree = self.get_tree_no_parents_abc_content(work_tree)
-        expected = [('', 'V', 'directory', 'root-id'),
-                    ('a', 'V', 'file', 'a-id'),
-                    ('b', 'V', 'directory', 'b-id'),
-                    ('b/c', 'V', 'file', 'c-id'),
-                   ]
-        tree.lock_read()
-        try:
-            actual = [(path, status, kind, file_id)
-                      for path, status, kind, file_id, ie in
-                          tree.list_files(include_root=True)]
-        finally:
-            tree.unlock()
-        self.assertEqual(expected, actual)
+        self.assertListFiles([('', 'V', 'directory', 'root-id'),
+                              ('a', 'V', 'file', 'a-id'),
+                              ('b', 'V', 'directory', 'b-id'),
+                              ('b/c', 'V', 'file', 'c-id'),],
+                             include_root=True)
 
     def test_list_files_no_root(self):
-        work_tree = self.make_branch_and_tree('wt')
-        tree = self.get_tree_no_parents_abc_content(work_tree)
-        expected = [('a', 'V', 'file', 'a-id'),
-                    ('b', 'V', 'directory', 'b-id'),
-                    ('b/c', 'V', 'file', 'c-id'),
-                   ]
-        tree.lock_read()
-        try:
-            actual = [(path, status, kind, file_id)
-                      for path, status, kind, file_id, ie in
-                          tree.list_files()]
-        finally:
-            tree.unlock()
-        self.assertEqual(expected, actual)
+        self.assertListFiles([('a', 'V', 'file', 'a-id'),
+                              ('b', 'V', 'directory', 'b-id'),
+                              ('b/c', 'V', 'file', 'c-id'),
+                              ])
 
     def test_list_files_with_root_no_recurse(self):
-        work_tree = self.make_branch_and_tree('wt')
-        tree = self.get_tree_no_parents_abc_content(work_tree)
-        expected = [('', 'V', 'directory', 'root-id'),
-                    ('a', 'V', 'file', 'a-id'),
-                    ('b', 'V', 'directory', 'b-id'),
-                   ]
-        tree.lock_read()
-        try:
-            actual = [(path, status, kind, file_id)
-                for path, status, kind, file_id, ie in
-                    tree.list_files(include_root=True, recursive=False)]
-        finally:
-            tree.unlock()
-        self.assertEqual(expected, actual)
+        self.assertListFiles([('', 'V', 'directory', 'root-id'),
+                              ('a', 'V', 'file', 'a-id'),
+                              ('b', 'V', 'directory', 'b-id'),
+                              ],
+                             include_root=True, recursive=False)
 
     def test_list_files_no_root_no_recurse(self):
-        work_tree = self.make_branch_and_tree('wt')
-        tree = self.get_tree_no_parents_abc_content(work_tree)
-        expected = [('a', 'V', 'file', 'a-id'),
-                    ('b', 'V', 'directory', 'b-id'),
-                   ]
-        tree.lock_read()
-        try:
-            actual = [(path, status, kind, file_id)
-                for path, status, kind, file_id, ie in
-                    tree.list_files(recursive=False)]
-        finally:
-            tree.unlock()
-        self.assertEqual(expected, actual)
+        self.assertListFiles([('a', 'V', 'file', 'a-id'),
+                              ('b', 'V', 'directory', 'b-id'),
+                              ],
+                             recursive=False)
 
     def test_list_files_from_dir(self):
-        work_tree = self.make_branch_and_tree('wt')
-        tree = self.get_tree_no_parents_abc_content(work_tree)
-        expected = [('c', 'V', 'file', 'c-id'),
-                   ]
-        tree.lock_read()
-        try:
-            actual = [(path, status, kind, file_id)
-                      for path, status, kind, file_id, ie in
-                          tree.list_files(from_dir='b')]
-        finally:
-            tree.unlock()
-        self.assertEqual(expected, actual)
+        self.assertListFiles([('c', 'V', 'file', 'c-id'),],
+                             from_path='b')
 
     def test_list_files_from_dir_no_recurse(self):
         # The test trees don't have much nesting so test with an explicit root
-        work_tree = self.make_branch_and_tree('wt')
-        tree = self.get_tree_no_parents_abc_content(work_tree)
-        expected = [('a', 'V', 'file', 'a-id'),
-                    ('b', 'V', 'directory', 'b-id'),
-                   ]
-        tree.lock_read()
-        try:
-            actual = [(path, status, kind, file_id)
-                      for path, status, kind, file_id, ie in
-                          tree.list_files(from_dir='', recursive=False)]
-        finally:
-            tree.unlock()
-        self.assertEqual(expected, actual)
+        self.assertListFiles([('a', 'V', 'file', 'a-id'),
+                              ('b', 'V', 'directory', 'b-id'),],
+                             from_path='', recursive=False)
+
+    def test_list_files_from_file(self):
+        self.assertListFiles([('a', 'V', 'file', 'a-id'),],
+                             from_path='a')
+
+    def test_list_files_from_file2(self):
+        self.assertListFiles([('c', 'V', 'file', 'c-id'),],
+                             from_path='b/c')
+
+    def test_list_files_from_dir_deprecated(self):
+        self.tree.lock_read()
+        self.addCleanup(self.tree.unlock)
+        self.callDeprecated(
+            [symbol_versioning.deprecated_in((2, 3, 0)) %
+             '"from_dir" parameter to Tree.list_files()'
+             ' Use Tree.list_files(from_path=) instead.'],
+            list,
+            self.tree.list_files(from_dir='b'))

=== modified file 'bzrlib/transform.py'
--- bzrlib/transform.py	2011-01-13 02:43:21 +0000
+++ bzrlib/transform.py	2011-01-13 07:27:10 +0000
@@ -24,7 +24,11 @@
     errors,
     lazy_import,
     registry,
+<<<<<<< TREE
     tree,
+=======
+    symbol_versioning,
+>>>>>>> MERGE-SOURCE
     )
 lazy_import.lazy_import(globals(), """
 from bzrlib import (
@@ -60,11 +64,24 @@
     )
 from bzrlib.progress import ProgressPhase
 from bzrlib.symbol_versioning import (
+<<<<<<< TREE
     deprecated_function,
     deprecated_in,
     deprecated_method,
     )
 from bzrlib.trace import warning
+=======
+        deprecated_function,
+        deprecated_in,
+        deprecated_method,
+        deprecated_passed,
+        DEPRECATED_PARAMETER,
+        )
+from bzrlib.trace import mutter, warning
+from bzrlib import tree
+import bzrlib.ui
+import bzrlib.urlutils as urlutils
+>>>>>>> MERGE-SOURCE
 
 
 ROOT_PARENT = "root-parent"
@@ -2112,14 +2129,30 @@
         for entry, trans_id in self._make_inv_entries(ordered_ids):
             yield unicode(self._final_paths.get_path(trans_id)), entry
 
-    def list_files(self, include_root=False, from_dir=None, recursive=True):
+    def list_files(self, include_root=False, from_path=None, recursive=True,
+                   from_dir=DEPRECATED_PARAMETER):
         """See WorkingTree.list_files."""
+        if deprecated_passed(from_dir):
+            symbol_versioning.warn(deprecated_in((2,3,0)) %
+                 '"from_dir" parameter to Tree.list_files()'
+                 ' Use Tree.list_files(from_path=) instead.',
+                 DeprecationWarning, stacklevel=2)
+            from_path=from_dir
         # XXX This should behave like WorkingTree.list_files, but is really
         # more like RevisionTree.list_files.
-        if recursive:
+        if from_path is None:
+            from_path_id = None
+            from_path_kind = 'directory'
+        else:
+            from_path_id = self.path2id(from_path)
+            if from_path is None:
+                # Path not versioned
+                return
+            from_path_kind = self.kind(from_path_id)
+        if recursive and from_path_kind == 'directory':
             prefix = None
-            if from_dir:
-                prefix = from_dir + '/'
+            if from_path:
+                prefix = from_path + '/'
             entries = self.iter_entries_by_dir()
             for path, entry in entries:
                 if entry.name == '' and not include_root:
@@ -2129,14 +2162,18 @@
                         continue
                     path = path[len(prefix):]
                 yield path, 'V', entry.kind, entry.file_id, entry
-        else:
-            if from_dir is None and include_root is True:
+        elif from_path_kind == 'directory':
+            if from_path is None and include_root is True:
                 root_entry = inventory.make_entry('directory', '',
                     ROOT_PARENT, self.get_root_id())
                 yield '', 'V', 'directory', root_entry.file_id, root_entry
-            entries = self._iter_entries_for_dir(from_dir or '')
+            entries = self._iter_entries_for_dir(from_path or '')
             for path, entry in entries:
                 yield path, 'V', entry.kind, entry.file_id, entry
+        else:
+            for path, entry in self.iter_entries_by_dir((from_path_id,)):
+                path = osutils.split(path)[1]
+                yield path, 'V', entry.kind, entry.file_id, entry
 
     def kind(self, file_id):
         trans_id = self._transform.trans_id_file_id(file_id)

=== modified file 'bzrlib/workingtree.py'
--- bzrlib/workingtree.py	2010-11-04 17:48:47 +0000
+++ bzrlib/workingtree.py	2011-01-13 07:27:10 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2010 Canonical Ltd
+# Copyright (C) 2005-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -98,9 +98,11 @@
 from bzrlib.transport.local import LocalTransport
 from bzrlib.revision import CURRENT_REVISION
 from bzrlib.rio import RioReader, rio_file, Stanza
+from bzrlib import symbol_versioning
 from bzrlib.symbol_versioning import (
     deprecated_passed,
     DEPRECATED_PARAMETER,
+    deprecated_in,
     )
 
 
@@ -1207,7 +1209,8 @@
     def _kind(self, relpath):
         return osutils.file_kind(self.abspath(relpath))
 
-    def list_files(self, include_root=False, from_dir=None, recursive=True):
+    def list_files(self, include_root=False, from_path=None, recursive=True,
+                   from_dir=DEPRECATED_PARAMETER):
         """List all files as (path, class, kind, id, entry).
 
         Lists, but does not descend into unversioned directories.
@@ -1215,16 +1218,24 @@
         tree. Skips the control directory.
 
         :param include_root: if True, return an entry for the root
-        :param from_dir: start from this directory or None for the root
+        :param from_path: if a directory, start from this directory
+            (None for the root); otherwise yield this entry
         :param recursive: whether to recurse into subdirectories or not
         """
+        if deprecated_passed(from_dir):
+            symbol_versioning.warn(deprecated_in((2,3,0)) %
+                 '"from_dir" parameter to Tree.list_files()'
+                 ' Use Tree.list_files(from_path=) instead.',
+                 DeprecationWarning, stacklevel=2)
+            from_path=from_dir
+
         # list_files is an iterator, so @needs_read_lock doesn't work properly
         # with it. So callers should be careful to always read_lock the tree.
         if not self.is_locked():
             raise errors.ObjectNotLocked(self)
 
         inv = self.inventory
-        if from_dir is None and include_root is True:
+        if from_path is None and include_root is True:
             yield ('', 'V', 'directory', inv.root.file_id, inv.root)
         # Convert these into local objects to save lookup times
         pathjoin = osutils.pathjoin
@@ -1234,20 +1245,33 @@
         # between the last two slashes
         transport_base_dir = self.bzrdir.transport.base.rsplit('/', 2)[1]
 
-        fk_entries = {'directory':TreeDirectory, 'file':TreeFile, 'symlink':TreeLink}
-
-        # directory file_id, relative path, absolute path, reverse sorted children
+        fk_entries = {'directory':TreeDirectory, 'file':TreeFile,
+                      'symlink':TreeLink}
+
+        # directory file_id, relative path, absolute path, reverse sorted
+        # children
+        from_path_is_dir = (from_path is None
+                            or file_kind(from_path) == 'directory')
+        if not from_path_is_dir:
+            from_dir, from_file = os.path.split(from_path)
+            children = [from_file]
+        else:
+            from_dir = from_path
+
         if from_dir is not None:
             from_dir_id = inv.path2id(from_dir)
+            from_dir_abspath = pathjoin(self.basedir, from_dir)
             if from_dir_id is None:
                 # Directory not versioned
                 return
-            from_dir_abspath = pathjoin(self.basedir, from_dir)
         else:
             from_dir_id = inv.root.file_id
             from_dir_abspath = self.basedir
-        children = os.listdir(from_dir_abspath)
-        children.sort()
+
+        if from_path_is_dir:
+            children = os.listdir(from_dir_abspath)
+            children.sort()
+        
         # jam 20060527 The kernel sized tree seems equivalent whether we
         # use a deque and popleft to keep them sorted, or if we use a plain
         # list and just reverse() them.

=== modified file 'bzrlib/workingtree_4.py'
--- bzrlib/workingtree_4.py	2010-12-02 10:41:05 +0000
+++ bzrlib/workingtree_4.py	2011-01-13 07:27:10 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2010 Canonical Ltd
+# Copyright (C) 2007-2011 Canonical Ltd
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,6 +45,7 @@
     trace,
     transform,
     views,
+    symbol_versioning,
     )
 import bzrlib.branch
 import bzrlib.ui
@@ -1873,22 +1874,39 @@
     def is_locked(self):
         return self._locked
 
-    def list_files(self, include_root=False, from_dir=None, recursive=True):
+    def list_files(self, include_root=False, from_path=None, recursive=True,
+                   from_dir=symbol_versioning.DEPRECATED_PARAMETER):
+        if symbol_versioning.deprecated_passed(from_dir):
+            symbol_versioning.warn(symbol_versioning.deprecated_in((2,3,0)) %
+                 '"from_dir" parameter to Tree.list_files()'
+                 ' Use Tree.list_files(from_path=) instead.',
+                 DeprecationWarning, stacklevel=2)
+            from_path=from_dir
         # We use a standard implementation, because DirStateRevisionTree is
         # dealing with one of the parents of the current state
-        inv = self._get_inventory()
-        if from_dir is None:
-            from_dir_id = None
+        # The only files returned by this are those from the version
+        inv = self.inventory
+        if from_path is None:
+            from_path_id = None
+            from_path_kind = 'directory'
         else:
-            from_dir_id = inv.path2id(from_dir)
-            if from_dir_id is None:
-                # Directory not versioned
+            from_path_id = inv.path2id(from_path)
+            if from_path is None:
+                # Path not versioned
                 return
-        entries = inv.iter_entries(from_dir=from_dir_id, recursive=recursive)
-        if inv.root is not None and not include_root and from_dir is None:
-            entries.next()
-        for path, entry in entries:
-            yield path, 'V', entry.kind, entry.file_id, entry
+            from_path_kind = self.kind(from_path_id)
+        if from_path_kind == 'directory':
+            entries = inv.iter_entries(from_dir=from_path_id,
+                                       recursive=recursive)
+            if inv.root is not None and not include_root and from_path is None:
+                # skip the root for compatability with the current apis.
+                entries.next()
+            for path, entry in entries:
+                yield path, 'V', entry.kind, entry.file_id, entry
+        else:
+            entry = inv[from_path_id]
+            file_path = osutils.split(from_path)[1]
+            yield file_path, 'V', from_path_kind, from_path_id, entry
 
     def lock_read(self):
         """Lock the tree for a set of operations.

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- doc/en/release-notes/bzr-2.3.txt	2011-01-12 23:37:16 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2011-01-13 07:27:10 +0000
@@ -35,9 +35,15 @@
   once.  This avoids some unnecessary IO, and removes a network roundtrip
   when doing ``bzr branch`` to a smart server URL.  (Andrew Bennetts)
 
+<<<<<<< TREE
 * ``bzr modified`` now read-locks the working tree (and branch and
   repository) just once.  (Andrew Bennetts)
   
+=======
+* ``bzr ls FILE`` now lists the file passed, similar to how GNU coreutils
+  ``ls`` behaves. (Gary van der Merwe, #492116)
+
+>>>>>>> MERGE-SOURCE
 * ``bzr resolve`` now accepts ``--take-this`` and ``--take-other`` actions
   for text conflicts. This *replace* the whole file with the content
   designated by the action. This will *ignore* all differences that would
@@ -123,10 +129,19 @@
   already opened that repository).  Implementations of these APIs will
   need to be updated to accept these arguments.  (Andrew Bennetts)
 
+<<<<<<< TREE
 * ``bzrlib.tuned_gzip.GzipFile`` is now deprecated and will be removed in
   the bzr-2.4 series. Code that was using it can just use the python
   stdlib ``gzip.GzipFile``. (John Arbash Meinel)
 
+=======
+* ``Tree.list_files`` if passed a file, rather than a directory, will yield
+  just the file. In order to represent this, the ``from_dir`` argument has
+  been renamed to ``from_path``, and the ``from_dir`` argument is deprecated.
+  (Gary van der Merwe)
+  
+
+>>>>>>> MERGE-SOURCE
 Internals
 *********