do_bloom(): remove unused "count" variable

[bup.git] / lib / bup / ls.py

diff --git a/lib/bup/ls.py b/lib/bup/ls.py
index 66e421d40c254b33744aa4f85f91a26418c84753..72f8b9b67b3a5dbcbe6a5a48d6ec49d635b30233 100644 (file)
--- a/lib/bup/ls.py
+++ b/lib/bup/ls.py
@@ -1,5 +1,5 @@
 """Common code for listing files from a bup repository."""
-import copy, stat, xstat
+import copy, os.path, stat, xstat
 from bup import metadata, options, vfs
 from helpers import *
 
@@ -19,6 +19,7 @@ def node_info(n, name,
         meta = copy.copy(n.metadata())
         if meta:
             meta.path = name
+            meta.size = n.size()
         else:
             # Fake it -- summary_str() is designed to handle a fake.
             meta = metadata.Metadata()
@@ -47,6 +48,7 @@ s,hash   show hash for each file
 a,all    show hidden files
 A,almost-all    show hidden files except . and ..
 l        use a detailed, long listing format
+d,directory show directories, not contents; don't follow symlinks
 F,classify append type indicator: dir/ sym@ fifo| sock= exec*
 file-type append type indicator: dir/ sym@ fifo| sock=
 human-readable    print human readable file sizes (i.e. 3.9K, 4.7M)
@@ -98,9 +100,12 @@ def do_ls(args, pwd, default='.', onabort=None, spec_prefix=''):
     ret = 0
     for path in (extra or [default]):
         try:
-            n = pwd.try_resolve(path)
+            if opt.directory:
+                n = pwd.lresolve(path)
+            else:
+                n = pwd.try_resolve(path)
 
-            if stat.S_ISDIR(n.mode):
+            if not opt.directory and stat.S_ISDIR(n.mode):
                 if show_hidden == 'all':
                     output_node_info(n, '.')
                     # Match non-bup "ls -a ... /".
@@ -114,7 +119,7 @@ def do_ls(args, pwd, default='.', onabort=None, spec_prefix=''):
                        or not len(name)>1 or not name.startswith('.'):
                         output_node_info(sub, name)
             else:
-                output_node_info(n, path)
+                output_node_info(n, os.path.normpath(path))
         except vfs.NodeError, e:
             log('error: %s\n' % e)
             ret = 1