packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main: Assume / for ls if no path given 

Since it just is kind of a sane default.
This commit is contained in:
Colin Walters 2013-07-27 20:12:07 -04:00
parent 7c5c3f2af8
commit 760b866104
2 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/ostree/ot-builtin-ls.c
View File

@ -198,6 +198,46 @@ print_directory_recurse (GFile *f,
return ret; return ret;
} }
static gboolean
print_one_argument (OstreeRepo *repo,
GFile *root,
const char *arg,
GCancellable *cancellable,
GError **error)
{
gboolean ret = FALSE;
gs_unref_object GFile *f = NULL;
gs_unref_object GFileInfo *file_info = NULL;
f = g_file_resolve_relative_path (root, arg);
file_info = g_file_query_info (f, OSTREE_GIO_FAST_QUERYINFO,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
cancellable, error);
if (!file_info)
goto out;
print_one_file (f, file_info);
if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
{
if (opt_recursive)
{
if (!print_directory_recurse (f, -1, error))
goto out;
}
else if (!opt_dironly)
{
if (!print_directory_recurse (f, 1, error))
goto out;
}
}
ret = TRUE;
out:
return ret;
}
gboolean gboolean
ostree_builtin_ls (int argc, char **argv, GFile *repo_path, GCancellable *cancellable, GError **error) ostree_builtin_ls (int argc, char **argv, GFile *repo_path, GCancellable *cancellable, GError **error)
{ {
@ -220,9 +260,9 @@ ostree_builtin_ls (int argc, char **argv, GFile *repo_path, GCancellable *cancel
if (!ostree_repo_check (repo, error)) if (!ostree_repo_check (repo, error))
goto out; goto out;
if (argc <= 2) if (argc <= 1)
{ {
ot_util_usage_error (context, "An COMMIT and at least one PATH argument are required", error); ot_util_usage_error (context, "An COMMIT argument is required", error);
goto out; goto out;
} }
rev = argv[1]; rev = argv[1];
@ -230,35 +270,20 @@ ostree_builtin_ls (int argc, char **argv, GFile *repo_path, GCancellable *cancel
if (!ostree_repo_read_commit (repo, rev, &root, cancellable, error)) if (!ostree_repo_read_commit (repo, rev, &root, cancellable, error))
goto out; goto out;
for (i = 2; i < argc; i++) if (argc > 2)
{ {
g_clear_object (&f); for (i = 2; i < argc; i++)
f = g_file_resolve_relative_path (root, argv[i]);
g_clear_object (&file_info);
file_info = g_file_query_info (f, OSTREE_GIO_FAST_QUERYINFO,
G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
cancellable, error);
if (!file_info)
goto out;
print_one_file (f, file_info);
if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_DIRECTORY)
{ {
if (opt_recursive) if (!print_one_argument (repo, root, argv[i], cancellable, error))
{ goto out;
if (!print_directory_recurse (f, -1, error))
goto out;
}
else if (!opt_dironly)
{
if (!print_directory_recurse (f, 1, error))
goto out;
}
} }
} }
else
{
if (!print_one_argument (repo, root, "/", cancellable, error))
goto out;
}
ret = TRUE; ret = TRUE;
out: out:
if (context) if (context)

6
tests/test-basic.sh
View File

@ -19,7 +19,7 @@
set -e set -e
echo "1..34" echo "1..35"
. $(dirname $0)/libtest.sh . $(dirname $0)/libtest.sh
@ -241,3 +241,7 @@ $OSTREE checkout test2 test2-checkout
(cd test2-checkout && $OSTREE commit --link-checkout-speedup -b test2 -s "tmp") (cd test2-checkout && $OSTREE commit --link-checkout-speedup -b test2 -s "tmp")
echo "ok commit with link speedup" echo "ok commit with link speedup"
cd ${test_tmpdir}
$OSTREE ls test2
echo "ok ls with no argument"