← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-04-08 19:15:23 UTC
  • mfrom: (4272.1.2 non-recursive-ls-arg)
  • Revision ID: pqm@pqm.ubuntu.com-20090408191523-xbmkv119txxrwxr7
(Jelmer) Fix non-recursive ls with path argument.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2362
2362
        try:
2363
2363
            for fp, fc, fkind, fid, entry in tree.list_files(include_root=False):
2364
2364
                if fp.startswith(relpath):
2365
 
                    fp = osutils.pathjoin(prefix, fp[len(relpath):])
2366
 
                    if not recursive and '/' in fp:
 
2365
                    rp = fp[len(relpath):]
 
2366
                    fp = osutils.pathjoin(prefix, rp)
 
2367
                    if not recursive and '/' in rp:
2367
2368
                        continue
2368
2369
                    if not all and not selection[fc]:
2369
2370
                        continue