"""Common code for listing files from a bup repository."""
-from __future__ import print_function
+from __future__ import absolute_import, print_function
from itertools import chain
from stat import S_ISDIR, S_ISLNK
-import copy, locale, os.path, stat, sys, xstat
+import copy, locale, os.path, stat, sys
-from bup import metadata, options, vfs2 as vfs
-from bup.repo import LocalRepo
-from helpers import columnate, istty1, last, log
+from bup import metadata, options, vfs, xstat
+from bup.options import Options
+from bup.repo import LocalRepo, RemoteRepo
+from bup.helpers import columnate, istty1, last, log
+def item_hash(item, tree_for_commit):
+ """If the item is a Commit, return its commit oid, otherwise return
+ the item's oid, if it has one.
+
+ """
+ if tree_for_commit and isinstance(item, vfs.Commit):
+ return item.coid
+ return getattr(item, 'oid', None)
def item_info(item, name,
show_hash = False,
+ commit_hash=False,
long_fmt = False,
classification = None,
numeric_ids = False,
"""
result = ''
- if show_hash and hasattr(item, 'oid'):
- result += '%s ' % item.oid.encode('hex')
+ if show_hash:
+ oid = item_hash(item, commit_hash)
+ result += '%s ' % (oid.encode('hex') if oid
+ else '0000000000000000000000000000000000000000')
if long_fmt:
meta = item.meta.copy()
meta.path = name
else:
result += name
if classification:
- result += xstat.classification_str(item.meta.mode,
+ result += xstat.classification_str(vfs.item_mode(item),
classification == 'all')
return result
optspec = """
-%sls [-a] [path...]
+bup ls [-r host:path] [-l] [-d] [-F] [-a] [-A] [-s] [-n] [path...]
--
+r,remote= remote repository path
s,hash show hash for each file
+commit-hash show commit hash instead of tree for commits (implies -s)
a,all show hidden files
A,almost-all show hidden files except . and ..
l use a detailed, long listing format
n,numeric-ids list numeric IDs (user, group, etc.) rather than names
"""
-def do_ls(args, default='.', onabort=None, spec_prefix=''):
- """Output a listing of a file or directory in the bup repository.
-
- When a long listing is not requested and stdout is attached to a
- tty, the output is formatted in columns. When not attached to tty
- (for example when the output is piped to another command), one
- file is listed per line.
+def opts_from_cmdline(args, onabort=None):
+ """Parse ls command line arguments and return a dictionary of ls
+ options, agumented with "classification", "long_listing",
+ "paths", and "show_hidden".
"""
if onabort:
- o = options.Options(optspec % spec_prefix, onabort=onabort)
+ opt, flags, extra = Options(optspec, onabort=onabort).parse(args)
else:
- o = options.Options(optspec % spec_prefix)
- (opt, flags, extra) = o.parse(args)
+ opt, flags, extra = Options(optspec).parse(args)
- # Handle order-sensitive options.
- classification = None
- show_hidden = None
+ opt.paths = extra or ('/',)
+ opt.long_listing = opt.l
+ opt.classification = None
+ opt.show_hidden = None
for flag in flags:
- (option, parameter) = flag
+ option, parameter = flag
if option in ('-F', '--classify'):
- classification = 'all'
+ opt.classification = 'all'
elif option == '--file-type':
- classification = 'type'
+ opt.classification = 'type'
elif option in ('-a', '--all'):
- show_hidden = 'all'
+ opt.show_hidden = 'all'
elif option in ('-A', '--almost-all'):
- show_hidden = 'almost'
+ opt.show_hidden = 'almost'
+ return opt
+
+def within_repo(repo, opt):
+
+ if opt.commit_hash:
+ opt.hash = True
def item_line(item, name):
return item_info(item, name,
- show_hash = opt.hash,
- long_fmt = opt.l,
- classification = classification,
- numeric_ids = opt.numeric_ids,
- human_readable = opt.human_readable)
+ show_hash=opt.hash,
+ commit_hash=opt.commit_hash,
+ long_fmt=opt.long_listing,
+ classification=opt.classification,
+ numeric_ids=opt.numeric_ids,
+ human_readable=opt.human_readable)
- repo = LocalRepo()
ret = 0
pending = []
- for path in (extra or [default]):
+ for path in opt.paths:
try:
if opt.directory:
- resolved = vfs.lresolve(repo, path)
+ resolved = vfs.resolve(repo, path, follow=False)
else:
- # FIXME: deal with invalid symlinks i.e. old vfs try_resolve
- resolved = vfs.resolve(repo, path)
+ resolved = vfs.try_resolve(repo, path)
leaf_name, leaf_item = resolved[-1]
if not leaf_item:
continue
if not opt.directory and S_ISDIR(vfs.item_mode(leaf_item)):
items = vfs.contents(repo, leaf_item)
- if show_hidden == 'all':
+ if opt.show_hidden == 'all':
# Match non-bup "ls -a ... /".
parent = resolved[-2] if len(resolved) > 1 else resolved[0]
items = chain(items, (('..', parent[1]),))
-
- items = ((x[0], vfs.augment_item_meta(repo, x[1],
- include_size=True))
- for x in items)
for sub_name, sub_item in sorted(items, key=lambda x: x[0]):
- if show_hidden != 'all' and sub_name == '.':
+ if opt.show_hidden != 'all' and sub_name == '.':
continue
if sub_name.startswith('.') and \
- show_hidden not in ('almost', 'all'):
+ opt.show_hidden not in ('almost', 'all'):
continue
+ if opt.l:
+ sub_item = vfs.ensure_item_has_metadata(repo, sub_item,
+ include_size=True)
+ else:
+ sub_item = vfs.augment_item_meta(repo, sub_item,
+ include_size=True)
line = item_line(sub_item, sub_name)
- pending.append(line) if not opt.l and istty1 else print(line)
+ if not opt.long_listing and istty1:
+ pending.append(line)
+ else:
+ print(line)
else:
leaf_item = vfs.augment_item_meta(repo, leaf_item,
include_size=True)
line = item_line(leaf_item, os.path.normpath(path))
- pending.append(line) if not opt.l and istty1 else print(line)
+ if not opt.long_listing and istty1:
+ pending.append(line)
+ else:
+ print(line)
except vfs.IOError as ex:
log('bup: %s\n' % ex)
ret = 1
sys.stdout.write(columnate(pending, ''))
return ret
+
+def via_cmdline(args, onabort=None):
+ """Output a listing of a file or directory in the bup repository.
+
+ When a long listing is not requested and stdout is attached to a
+ tty, the output is formatted in columns. When not attached to tty
+ (for example when the output is piped to another command), one
+ file is listed per line.
+
+ """
+ opt = opts_from_cmdline(args, onabort=onabort)
+ return within_repo(RemoteRepo(opt.remote) if opt.remote else LocalRepo(),
+ opt)
projects / bup.git / blobdiff