Earlier rounds broke 'whatchanged -p'. In attempting to fix this,
make two axis of output selection in rev-parse orthogonal:
--revs-only tells it not to output things that are not revisions nor
flags that rev-list would take.
--no-revs tells it not to output things that are revisions or
flags that rev-list would take.
--flags tells it not to output parameters that do not start with
a '-'.
--no-flags tells it not to output parameters that starts with a '-'.
So for example 'rev-parse --no-revs -p arch/i386' would yield '-p arch/i386',
while 'rev-parse --no-revs --flags -p archi/i386' would give just '-p'.
Also the meaning of --verify has been made stronger. It now rejects
anything but a single valid rev argument. Earlier it passed some flags
through without complaining.
Signed-off-by: Junio C Hamano <junkio@cox.net>
#include "commit.h"
#include "refs.h"
#include "commit.h"
#include "refs.h"
+#define DO_REVS 1
+#define DO_NOREV 2
+#define DO_FLAGS 4
+#define DO_NONFLAGS 8
+static int filter = ~0;
+
-static int no_revs = 0;
-static int single_rev = 0;
-static int revs_only = 0;
-static int do_rev_argument = 1;
-static int output_revs = 0;
-static int flags_only = 0;
-static int no_flags = 0;
-static int output_sq = 0;
-static int symbolic = 0;
#define NORMAL 0
#define REVERSED 1
static int show_type = NORMAL;
#define NORMAL 0
#define REVERSED 1
static int show_type = NORMAL;
+static int symbolic = 0;
+static int output_sq = 0;
+
+static int revs_count = 0;
/*
* Some arguments are relevant "revision" arguments,
/*
* Some arguments are relevant "revision" arguments,
static int is_rev_argument(const char *arg)
{
static const char *rev_args[] = {
static int is_rev_argument(const char *arg)
{
static const char *rev_args[] = {
+ "--bisect",
+ "--header",
- "--topo-order",
- "--bisect",
+ "--objects",
+ "--parents",
+ "--pretty",
+ "--show-breaks",
+ "--topo-order",
+ "--unpacked",
NULL
};
const char **p = rev_args;
NULL
};
const char **p = rev_args;
if (!str)
return 0;
len = strlen(str);
if (!str)
return 0;
len = strlen(str);
- if (!strncmp(arg, str, len))
+ if (!strcmp(arg, str) ||
+ (str[len-1] == '=' && !strncmp(arg, str, len)))
+/* Output argument as a string, either SQ or normal */
static void show(const char *arg)
{
if (output_sq) {
static void show(const char *arg)
{
if (output_sq) {
+/* Output a revision, only if filter allows it */
static void show_rev(int type, const unsigned char *sha1, const char *name)
{
static void show_rev(int type, const unsigned char *sha1, const char *name)
{
+ if (!(filter & DO_REVS))
+ def = NULL;
+ revs_count++;
if (type != show_type)
putchar('^');
if (type != show_type)
putchar('^');
show(sha1_to_hex(sha1));
}
show(sha1_to_hex(sha1));
}
-static void show_rev_arg(char *rev)
+/* Output a flag, only if filter allows it. */
+static void show_flag(char *arg)
+ if (!(filter & DO_FLAGS))
- show(rev);
-}
-
-static void show_norev(char *norev)
-{
- if (flags_only)
- return;
- if (revs_only)
- return;
- show(norev);
-}
-
-static void show_arg(char *arg)
-{
- if (no_flags)
- return;
- if (do_rev_argument && is_rev_argument(arg))
- show_rev_arg(arg);
- else
+ if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV))
show_rev(NORMAL, sha1, s);
return;
}
show_rev(NORMAL, sha1, s);
return;
}
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
+ int i, as_is = 0, verify = 0;
unsigned char sha1[20];
const char *prefix = setup_git_directory();
unsigned char sha1[20];
const char *prefix = setup_git_directory();
char *dotdot;
if (as_is) {
char *dotdot;
if (as_is) {
continue;
}
if (*arg == '-') {
if (!strcmp(arg, "--")) {
continue;
}
if (*arg == '-') {
if (!strcmp(arg, "--")) {
- show_default();
- if (revs_only || flags_only)
- break;
}
if (!strcmp(arg, "--default")) {
def = argv[i+1];
}
if (!strcmp(arg, "--default")) {
def = argv[i+1];
continue;
}
if (!strcmp(arg, "--revs-only")) {
continue;
}
if (!strcmp(arg, "--revs-only")) {
continue;
}
if (!strcmp(arg, "--no-revs")) {
continue;
}
if (!strcmp(arg, "--no-revs")) {
continue;
}
if (!strcmp(arg, "--flags")) {
continue;
}
if (!strcmp(arg, "--flags")) {
+ filter &= ~DO_NONFLAGS;
continue;
}
if (!strcmp(arg, "--no-flags")) {
continue;
}
if (!strcmp(arg, "--no-flags")) {
continue;
}
if (!strcmp(arg, "--verify")) {
continue;
}
if (!strcmp(arg, "--verify")) {
- revs_only = 1;
- do_rev_argument = 0;
- single_rev = 1;
+ filter &= ~(DO_FLAGS|DO_NOREV);
+ verify = 1;
continue;
}
if (!strcmp(arg, "--sq")) {
continue;
}
if (!strcmp(arg, "--sq")) {
continue;
}
if (!strcmp(arg, "--show-prefix")) {
continue;
}
if (!strcmp(arg, "--show-prefix")) {
+ if (prefix)
+ puts(prefix);
+ if (verify)
+ die("Needed a single revision");
+ show_flag(arg);
+
+ /* Not a flag argument */
dotdot = strstr(arg, "..");
if (dotdot) {
unsigned char end[20];
dotdot = strstr(arg, "..");
if (dotdot) {
unsigned char end[20];
if (!*n)
n = "HEAD";
if (!get_sha1(n, end)) {
if (!*n)
n = "HEAD";
if (!get_sha1(n, end)) {
- if (no_revs)
- continue;
- def = NULL;
show_rev(NORMAL, end, n);
show_rev(REVERSED, sha1, arg);
continue;
show_rev(NORMAL, end, n);
show_rev(REVERSED, sha1, arg);
continue;
*dotdot = '.';
}
if (!get_sha1(arg, sha1)) {
*dotdot = '.';
}
if (!get_sha1(arg, sha1)) {
- if (no_revs)
- continue;
- def = NULL;
show_rev(NORMAL, sha1, arg);
continue;
}
if (*arg == '^' && !get_sha1(arg+1, sha1)) {
show_rev(NORMAL, sha1, arg);
continue;
}
if (*arg == '^' && !get_sha1(arg+1, sha1)) {
- if (no_revs)
- continue;
- def = NULL;
show_rev(REVERSED, sha1, arg+1);
continue;
}
show_rev(REVERSED, sha1, arg+1);
continue;
}
- show_default();
- show_norev(arg);
+ if (verify)
+ die("Needed a single revision");
+ if ((filter & (DO_NONFLAGS|DO_NOREV)) ==
+ (DO_NONFLAGS|DO_NOREV))
+ show(arg);
- if (single_rev && output_revs != 1) {
- fprintf(stderr, "Needed a single revision\n");
- exit(1);
- }
+ if (verify && revs_count != 1)
+ die("Needed a single revision");