Rev 4274: (Jelmer) Fix non-recursive ls with path argument. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4274
revision-id: pqm at pqm.ubuntu.com-20090408191523-xbmkv119txxrwxr7
parent: pqm at pqm.ubuntu.com-20090408143103-36oiu9zhl4r91hdq
parent: jelmer at samba.org-20090408181836-lf7qwg78ak5crk4v
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-04-08 20:15:23 +0100
message:
  (Jelmer) Fix non-recursive ls with path argument.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
    ------------------------------------------------------------
    revno: 4272.1.2
    revision-id: jelmer at samba.org-20090408181836-lf7qwg78ak5crk4v
    parent: jelmer at samba.org-20090408180200-u0c31eth604zxwuo
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: non-recursive-ls-arg
    timestamp: Wed 2009-04-08 20:18:36 +0200
    message:
      Fix formatting per Johns comments.
    modified:
      bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
    ------------------------------------------------------------
    revno: 4272.1.1
    revision-id: jelmer at samba.org-20090408180200-u0c31eth604zxwuo
    parent: pqm at pqm.ubuntu.com-20090408132905-lbf9hl67lmbttykx
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr.dev
    timestamp: Wed 2009-04-08 20:02:00 +0200
    message:
      non-recursive bzr ls now works properly when a path is specified.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
=== modified file 'NEWS'
--- a/NEWS	2009-04-08 13:13:30 +0000
+++ b/NEWS	2009-04-08 19:15:23 +0000
@@ -31,6 +31,9 @@
 Bug Fixes
 *********
 
+* Non-recursive ``bzr ls`` now works properly when a path is specified.
+  (Jelmer Vernooij, #357863)
+
 Documentation
 *************
 

=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py	2009-04-08 12:39:40 +0000
+++ b/bzrlib/builtins.py	2009-04-08 18:02:00 +0000
@@ -2362,8 +2362,9 @@
         try:
             for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
                 if fp.startswith(relpath):
-                    fp = osutils.pathjoin(prefix, fp[len(relpath):])
-                    if not recursive and '/' in fp:
+                    rp = fp[len(relpath):]
+                    fp = osutils.pathjoin(prefix, rp)
+                    if not recursive and '/' in rp:
                         continue
                     if not all and not selection[fc]:
                         continue

=== modified file 'bzrlib/tests/blackbox/test_ls.py'
--- a/bzrlib/tests/blackbox/test_ls.py	2009-03-26 13:38:31 +0000
+++ b/bzrlib/tests/blackbox/test_ls.py	2009-04-08 18:18:36 +0000
@@ -236,3 +236,9 @@
         self.ls_equals('',
                        '--kind=symlink')
         self.run_bzr_error('invalid kind specified', 'ls --kind=pile')
+
+    def test_ls_path_nonrecursive(self):
+        self.ls_equals('%s/.bzrignore\n'
+                       '%s/a\n'
+                       % (self.test_dir, self.test_dir),
+                       self.test_dir, recursive=False)