diff --git a/rev-parse.c b/rev-parse.c
index f1f5163447e98f1afb65137fd7cc9db7ff793b29..a5fb93c3ca993dc240f87a9ac5ee6447b10b7cad 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
#include "cache.h"
#include "commit.h"
#include "refs.h"
#include "cache.h"
#include "commit.h"
#include "refs.h"
+#include "quote.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 REVERSED 1
static int show_type = NORMAL;
#define NORMAL 0
#define REVERSED 1
static int show_type = NORMAL;
+static int symbolic = 0;
+static int abbrev = 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[] = {
- "--max-count=",
+ "--all",
+ "--bisect",
+ "--dense",
+ "--header",
"--max-age=",
"--max-age=",
- "--min-age=",
+ "--max-count=",
"--merge-order",
"--merge-order",
- "--topo-order",
- "--bisect",
+ "--min-age=",
"--no-merges",
"--no-merges",
+ "--objects",
+ "--parents",
+ "--pretty",
+ "--show-breaks",
+ "--sparse",
+ "--topo-order",
+ "--date-order",
+ "--unpacked",
NULL
};
const char **p = rev_args;
NULL
};
const char **p = rev_args;
+ /* accept -<digit>, like traditional "head" */
+ if ((*arg == '-') && isdigit(arg[1]))
+ return 1;
+
for (;;) {
const char *str = *p++;
int len;
if (!str)
return 0;
len = strlen(str);
for (;;) {
const char *str = *p++;
int len;
if (!str)
return 0;
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)
{
if (output_sq) {
static void show(const char *arg)
{
if (output_sq) {
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)
putchar('^');
if (symbolic && name)
show(name);
if (type != show_type)
putchar('^');
if (symbolic && name)
show(name);
+ else if (abbrev)
+ show(find_unique_abbrev(sha1, abbrev));
else
show(sha1_to_hex(sha1));
}
else
show(sha1_to_hex(sha1));
}
-static void show_rev_arg(char *rev)
+/* Output a flag, only if filter allows it. */
+static int show_flag(char *arg)
{
{
- if (no_revs)
- return;
- 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
- show_norev(arg);
+ if (!(filter & DO_FLAGS))
+ return 0;
+ if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV)) {
+ show(arg);
+ return 1;
+ }
+ return 0;
}
static void show_default(void)
}
static void show_default(void)
show_rev(NORMAL, sha1, s);
return;
}
show_rev(NORMAL, sha1, s);
return;
}
- show_arg(s);
}
}
}
}
return 0;
}
return 0;
}
+static void show_datestring(const char *flag, const char *datestr)
+{
+ static char buffer[100];
+
+ /* date handling requires both flags and revs */
+ if ((filter & (DO_FLAGS | DO_REVS)) != (DO_FLAGS | DO_REVS))
+ return;
+ snprintf(buffer, sizeof(buffer), "%s%lu", flag, approxidate(datestr));
+ show(buffer);
+}
+
+static int show_file(const char *arg)
+{
+ show_default();
+ if ((filter & (DO_NONFLAGS|DO_NOREV)) == (DO_NONFLAGS|DO_NOREV)) {
+ show(arg);
+ return 1;
+ }
+ return 0;
+}
+
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];
const char *prefix = setup_git_directory();
for (i = 1; i < argc; i++) {
unsigned char sha1[20];
const char *prefix = setup_git_directory();
for (i = 1; i < argc; i++) {
+ struct stat st;
char *arg = argv[i];
char *dotdot;
if (as_is) {
char *arg = argv[i];
char *dotdot;
if (as_is) {
- show_norev(arg);
+ show_file(arg);
+ continue;
+ }
+ if (!strcmp(arg,"-n")) {
+ if (++i >= argc)
+ die("-n requires an argument");
+ if ((filter & DO_FLAGS) && (filter & DO_REVS)) {
+ show(arg);
+ show(argv[i]);
+ }
+ continue;
+ }
+ if (!strncmp(arg,"-n",2)) {
+ if ((filter & DO_FLAGS) && (filter & DO_REVS))
+ show(arg);
continue;
}
continue;
}
+
if (*arg == '-') {
if (!strcmp(arg, "--")) {
if (*arg == '-') {
if (!strcmp(arg, "--")) {
- show_default();
- if (revs_only)
- break;
as_is = 1;
as_is = 1;
+ /* Pass on the "--" if we show anything but files.. */
+ if (filter & (DO_FLAGS | DO_REVS))
+ show_file(arg);
+ continue;
}
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")) {
- revs_only = 1;
+ filter &= ~DO_NOREV;
continue;
}
if (!strcmp(arg, "--no-revs")) {
continue;
}
if (!strcmp(arg, "--no-revs")) {
- no_revs = 1;
+ filter &= ~DO_REVS;
continue;
}
if (!strcmp(arg, "--flags")) {
continue;
}
if (!strcmp(arg, "--flags")) {
- flags_only = 1;
+ filter &= ~DO_NONFLAGS;
continue;
}
if (!strcmp(arg, "--no-flags")) {
continue;
}
if (!strcmp(arg, "--no-flags")) {
- no_flags = 1;
+ filter &= ~DO_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, "--short") ||
+ !strncmp(arg, "--short=", 8)) {
+ filter &= ~(DO_FLAGS|DO_NOREV);
+ verify = 1;
+ abbrev = DEFAULT_ABBREV;
+ if (arg[7] == '=')
+ abbrev = strtoul(arg + 8, NULL, 10);
+ if (abbrev < MINIMUM_ABBREV)
+ abbrev = MINIMUM_ABBREV;
+ else if (40 <= abbrev)
+ abbrev = 40;
continue;
}
if (!strcmp(arg, "--sq")) {
continue;
}
if (!strcmp(arg, "--sq")) {
continue;
}
if (!strcmp(arg, "--show-prefix")) {
continue;
}
if (!strcmp(arg, "--show-prefix")) {
- puts(prefix);
+ if (prefix)
+ puts(prefix);
continue;
}
continue;
}
- show_arg(arg);
+ if (!strcmp(arg, "--show-cdup")) {
+ const char *pfx = prefix;
+ while (pfx) {
+ pfx = strchr(pfx, '/');
+ if (pfx) {
+ pfx++;
+ printf("../");
+ }
+ }
+ putchar('\n');
+ continue;
+ }
+ if (!strcmp(arg, "--git-dir")) {
+ const char *gitdir = getenv(GIT_DIR_ENVIRONMENT);
+ static char cwd[PATH_MAX];
+ if (gitdir) {
+ puts(gitdir);
+ continue;
+ }
+ if (!prefix) {
+ puts(".git");
+ continue;
+ }
+ if (!getcwd(cwd, PATH_MAX))
+ die("unable to get current working directory");
+ printf("%s/.git\n", cwd);
+ continue;
+ }
+ if (!strncmp(arg, "--since=", 8)) {
+ show_datestring("--max-age=", arg+8);
+ continue;
+ }
+ if (!strncmp(arg, "--after=", 8)) {
+ show_datestring("--max-age=", arg+8);
+ continue;
+ }
+ if (!strncmp(arg, "--before=", 9)) {
+ show_datestring("--min-age=", arg+9);
+ continue;
+ }
+ if (!strncmp(arg, "--until=", 8)) {
+ show_datestring("--min-age=", arg+8);
+ continue;
+ }
+ if (show_flag(arg) && verify)
+ die("Needed a single revision");
continue;
}
continue;
}
+
+ /* 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);
+ as_is = 1;
+ if (!show_file(arg))
+ continue;
+ if (verify)
+ die("Needed a single revision");
+ if (lstat(arg, &st) < 0)
+ die("'%s': %s", arg, strerror(errno));
}
show_default();
}
show_default();
- 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");
return 0;
}
return 0;
}