diff --git a/rev-parse.c b/rev-parse.c
index 507b531dce781133946da04cb27fa2ff6d3832a9..a5fb93c3ca993dc240f87a9ac5ee6447b10b7cad 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
#define REVERSED 1
static int show_type = NORMAL;
static int symbolic = 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;
static int output_sq = 0;
static int revs_count = 0;
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[] = {
+ "--all",
"--bisect",
"--bisect",
+ "--dense",
"--header",
"--max-age=",
"--max-count=",
"--header",
"--max-age=",
"--max-count=",
"--parents",
"--pretty",
"--show-breaks",
"--parents",
"--pretty",
"--show-breaks",
+ "--sparse",
"--topo-order",
"--topo-order",
+ "--date-order",
"--unpacked",
NULL
};
const char **p = rev_args;
"--unpacked",
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;
for (;;) {
const char *str = *p++;
int len;
putchar('^');
if (symbolic && name)
show(name);
putchar('^');
if (symbolic && name)
show(name);
+ else if (abbrev)
+ show(find_unique_abbrev(sha1, abbrev));
else
show(sha1_to_hex(sha1));
}
/* Output a flag, only if filter allows it. */
else
show(sha1_to_hex(sha1));
}
/* Output a flag, only if filter allows it. */
-static void show_flag(char *arg)
+static int show_flag(char *arg)
{
if (!(filter & DO_FLAGS))
{
if (!(filter & DO_FLAGS))
- return;
- if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV))
+ return 0;
+ if (filter & (is_rev_argument(arg) ? DO_REVS : DO_NOREV)) {
show(arg);
show(arg);
+ return 1;
+ }
+ return 0;
}
static void show_default(void)
}
static void show_default(void)
static void show_datestring(const char *flag, const char *datestr)
{
static void show_datestring(const char *flag, const char *datestr)
{
- FILE *date;
static char buffer[100];
static char buffer[100];
- static char cmd[1000];
- int len;
/* date handling requires both flags and revs */
if ((filter & (DO_FLAGS | DO_REVS)) != (DO_FLAGS | DO_REVS))
return;
/* date handling requires both flags and revs */
if ((filter & (DO_FLAGS | DO_REVS)) != (DO_FLAGS | DO_REVS))
return;
- len = strlen(flag);
- memcpy(buffer, flag, len);
-
- snprintf(cmd, sizeof(cmd), "date --date=%s +%%s", sq_quote(datestr));
- date = popen(cmd, "r");
- if (!date || !fgets(buffer + len, sizeof(buffer) - len, date))
- die("git-rev-list: bad date string");
- pclose(date);
- len = strlen(buffer);
- if (buffer[len-1] == '\n')
- buffer[--len] = 0;
+ snprintf(buffer, sizeof(buffer), "%s%lu", flag, approxidate(datestr));
show(buffer);
}
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 i, as_is = 0, verify = 0;
int main(int argc, char **argv)
{
int i, as_is = 0, verify = 0;
const char *prefix = setup_git_directory();
for (i = 1; i < argc; i++) {
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(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, "--")) {
as_is = 1;
if (*arg == '-') {
if (!strcmp(arg, "--")) {
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")) {
continue;
}
if (!strcmp(arg, "--default")) {
verify = 1;
continue;
}
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")) {
output_sq = 1;
continue;
if (!strcmp(arg, "--sq")) {
output_sq = 1;
continue;
puts(prefix);
continue;
}
puts(prefix);
continue;
}
+ 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 (!strcmp(arg, "--git-dir")) {
const char *gitdir = getenv(GIT_DIR_ENVIRONMENT);
static char cwd[PATH_MAX];
show_datestring("--min-age=", arg+8);
continue;
}
show_datestring("--min-age=", arg+8);
continue;
}
- if (verify)
+ if (show_flag(arg) && verify)
die("Needed a single revision");
die("Needed a single revision");
- show_flag(arg);
continue;
}
continue;
}
show_rev(REVERSED, sha1, arg+1);
continue;
}
show_rev(REVERSED, sha1, arg+1);
continue;
}
+ as_is = 1;
+ if (!show_file(arg))
+ continue;
if (verify)
die("Needed a single revision");
if (verify)
die("Needed a single revision");
- if ((filter & (DO_NONFLAGS|DO_NOREV)) ==
- (DO_NONFLAGS|DO_NOREV))
- show(arg);
+ if (lstat(arg, &st) < 0)
+ die("'%s': %s", arg, strerror(errno));
}
show_default();
if (verify && revs_count != 1)
}
show_default();
if (verify && revs_count != 1)