undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rationalize output selection in rev-parse.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-08-24 14:30:04 -07:00
parent ccf1ee327f
commit 4866ccf0f4
1 changed files with 55 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
rev-parse.c
View File

@ -7,20 +7,21 @@
#include "commit.h" #include "commit.h"
#include "refs.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 char *def = NULL; static char *def = NULL;
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 NORMAL 0
#define REVERSED 1 #define REVERSED 1
static int show_type = NORMAL; 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,
@ -30,13 +31,19 @@ static int show_type = NORMAL;
static int is_rev_argument(const char *arg) static int is_rev_argument(const char *arg)
{ {
static const char *rev_args[] = { static const char *rev_args[] = {
"--max-count=",
"--max-age=",
"--min-age=",
"--merge-order",
"--topo-order",
"--bisect", "--bisect",
"--header",
"--max-age=",
"--max-count=",
"--merge-order",
"--min-age=",
"--no-merges", "--no-merges",
"--objects",
"--parents",
"--pretty",
"--show-breaks",
"--topo-order",
"--unpacked",
NULL NULL
}; };
const char **p = rev_args; const char **p = rev_args;
@ -47,11 +54,13 @@ static int is_rev_argument(const char *arg)
if (!str) if (!str)
return 0; return 0;
len = strlen(str); len = strlen(str);
if (!strncmp(arg, str, len)) if (!strcmp(arg, str) ||
(str[len-1] == '=' && !strncmp(arg, str, len)))
return 1; return 1;
} }
} }
/* Output argument as a string, either SQ or normal */
static void show(const char *arg) static void show(const char *arg)
{ {
if (output_sq) { if (output_sq) {
@ -70,11 +79,13 @@ static void show(const char *arg)
puts(arg); puts(arg);
} }
/* 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 (no_revs) if (!(filter & DO_REVS))
return; return;
output_revs++; def = NULL;
revs_count++;
if (type != show_type) if (type != show_type)
putchar('^'); putchar('^');
@ -84,29 +95,12 @@ static void show_rev(int type, const unsigned char *sha1, const char *name)
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 (no_revs) if (!(filter & DO_FLAGS))
return; return;
show(rev); if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV))
}
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
show(arg); show(arg);
} }
@ -122,7 +116,6 @@ static void show_default(void)
show_rev(NORMAL, sha1, s); show_rev(NORMAL, sha1, s);
return; return;
} }
show_norev(s);
} }
} }
@ -134,7 +127,7 @@ static int show_reference(const char *refname, const unsigned char *sha1)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int i, as_is = 0; int i, as_is = 0, verify = 0;
unsigned char sha1[20]; unsigned char sha1[20];
const char *prefix = setup_git_directory(); const char *prefix = setup_git_directory();
@ -143,15 +136,13 @@ int main(int argc, char **argv)
char *dotdot; char *dotdot;
if (as_is) { if (as_is) {
show_norev(arg); show(arg);
continue; continue;
} }
if (*arg == '-') { if (*arg == '-') {
if (!strcmp(arg, "--")) { if (!strcmp(arg, "--")) {
show_default();
if (revs_only || flags_only)
break;
as_is = 1; as_is = 1;
continue;
} }
if (!strcmp(arg, "--default")) { if (!strcmp(arg, "--default")) {
def = argv[i+1]; def = argv[i+1];
@ -159,25 +150,24 @@ int main(int argc, char **argv)
continue; continue;
} }
if (!strcmp(arg, "--revs-only")) { if (!strcmp(arg, "--revs-only")) {
revs_only = 1; filter &= ~DO_NOREV;
continue; continue;
} }
if (!strcmp(arg, "--no-revs")) { if (!strcmp(arg, "--no-revs")) {
no_revs = 1; filter &= ~DO_REVS;
continue; continue;
} }
if (!strcmp(arg, "--flags")) { if (!strcmp(arg, "--flags")) {
flags_only = 1; filter &= ~DO_NONFLAGS;
continue; continue;
} }
if (!strcmp(arg, "--no-flags")) { if (!strcmp(arg, "--no-flags")) {
no_flags = 1; filter &= ~DO_FLAGS;
continue; continue;
} }
if (!strcmp(arg, "--verify")) { if (!strcmp(arg, "--verify")) {
revs_only = 1; filter &= ~(DO_FLAGS|DO_NOREV);
do_rev_argument = 0; verify = 1;
single_rev = 1;
continue; continue;
} }
if (!strcmp(arg, "--sq")) { if (!strcmp(arg, "--sq")) {
@ -197,12 +187,17 @@ int main(int argc, char **argv)
continue; continue;
} }
if (!strcmp(arg, "--show-prefix")) { if (!strcmp(arg, "--show-prefix")) {
puts(prefix); if (prefix)
puts(prefix);
continue; continue;
} }
show_arg(arg); if (verify)
die("Needed a single revision");
show_flag(arg);
continue; continue;
} }
/* Not a flag argument */
dotdot = strstr(arg, ".."); dotdot = strstr(arg, "..");
if (dotdot) { if (dotdot) {
unsigned char end[20]; unsigned char end[20];
@ -212,9 +207,6 @@ int main(int argc, char **argv)
if (!*n) if (!*n)
n = "HEAD"; n = "HEAD";
if (!get_sha1(n, end)) { if (!get_sha1(n, end)) {
if (no_revs)
continue;
def = NULL;
show_rev(NORMAL, end, n); show_rev(NORMAL, end, n);
show_rev(REVERSED, sha1, arg); show_rev(REVERSED, sha1, arg);
continue; continue;
@ -223,26 +215,21 @@ int main(int argc, char **argv)
*dotdot = '.'; *dotdot = '.';
} }
if (!get_sha1(arg, sha1)) { if (!get_sha1(arg, sha1)) {
if (no_revs)
continue;
def = NULL;
show_rev(NORMAL, sha1, arg); show_rev(NORMAL, sha1, arg);
continue; continue;
} }
if (*arg == '^' && !get_sha1(arg+1, sha1)) { if (*arg == '^' && !get_sha1(arg+1, sha1)) {
if (no_revs)
continue;
def = NULL;
show_rev(REVERSED, sha1, arg+1); show_rev(REVERSED, sha1, arg+1);
continue; continue;
} }
show_default(); if (verify)
show_norev(arg); die("Needed a single revision");
if ((filter & (DO_NONFLAGS|DO_NOREV)) ==
(DO_NONFLAGS|DO_NOREV))
show(arg);
} }
show_default(); show_default();
if (single_rev && output_revs != 1) { if (verify && revs_count != 1)
fprintf(stderr, "Needed a single revision\n"); die("Needed a single revision");
exit(1);
}
return 0; return 0;
} }