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

core: Make diff accept one argument too to mean "foo^ foo"

This commit is contained in:
Colin Walters 2012-01-08 14:20:07 -05:00
parent e21b181b4a
commit 888d33c943
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ostree/ot-builtin-diff.c
View File

@ -67,6 +67,7 @@ ostree_builtin_diff (int argc, char **argv, GFile *repo_path, GError **error)
GOptionContext *context; GOptionContext *context;
gboolean ret = FALSE; gboolean ret = FALSE;
OstreeRepo *repo = NULL; OstreeRepo *repo = NULL;
char *src_prev = NULL;
const char *src; const char *src;
const char *target; const char *target;
GFile *srcf = NULL; GFile *srcf = NULL;
@ -87,18 +88,27 @@ ostree_builtin_diff (int argc, char **argv, GFile *repo_path, GError **error)
if (!ostree_repo_check (repo, error)) if (!ostree_repo_check (repo, error))
goto out; goto out;
if (argc < 3) if (argc < 2)
{ {
gchar *help = g_option_context_get_help (context, TRUE, NULL); gchar *help = g_option_context_get_help (context, TRUE, NULL);
g_printerr ("%s\n", help); g_printerr ("%s\n", help);
g_free (help); g_free (help);
g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"REV and TARGETDIR must be specified"); "REV must be specified");
goto out; goto out;
} }
src = argv[1]; if (argc == 2)
target = argv[2]; {
src_prev = g_strconcat (argv[1], "^", NULL);
src = src_prev;
target = argv[1];
}
else
{
src = argv[1];
target = argv[2];
}
cwd = ot_gfile_new_for_path ("."); cwd = ot_gfile_new_for_path (".");
@ -135,6 +145,7 @@ ostree_builtin_diff (int argc, char **argv, GFile *repo_path, GError **error)
ret = TRUE; ret = TRUE;
out: out:
g_free (src_prev);
g_clear_object (&repo); g_clear_object (&repo);
g_clear_object (&cwd); g_clear_object (&cwd);
g_clear_object (&srcf); g_clear_object (&srcf);