*/
#include "cache.h"
#include "commit.h"
+#include "refs.h"
static char *def = NULL;
static int no_revs = 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;
-static int get_extended_sha1(char *name, unsigned char *sha1);
-
/*
* Some arguments are relevant "revision" arguments,
* others are about output format or other details.
"--max-age=",
"--min-age=",
"--merge-order",
+ "--topo-order",
+ "--bisect",
+ "--no-merges",
NULL
};
const char **p = rev_args;
}
}
-static void show_rev(int type, unsigned char *sha1)
+static void show(const char *arg)
+{
+ if (output_sq) {
+ int sq = '\'', ch;
+
+ putchar(sq);
+ while ((ch = *arg++)) {
+ if (ch == sq)
+ fputs("'\\'", stdout);
+ putchar(ch);
+ }
+ putchar(sq);
+ putchar(' ');
+ }
+ else
+ puts(arg);
+}
+
+static void show_rev(int type, const unsigned char *sha1, const char *name)
{
if (no_revs)
return;
output_revs++;
- printf("%s%s\n", type == show_type ? "" : "^", sha1_to_hex(sha1));
+
+ if (type != show_type)
+ putchar('^');
+ if (symbolic && name)
+ show(name);
+ else
+ show(sha1_to_hex(sha1));
}
static void show_rev_arg(char *rev)
{
if (no_revs)
return;
- puts(rev);
+ show(rev);
}
static void show_norev(char *norev)
{
+ if (flags_only)
+ return;
if (revs_only)
return;
- puts(norev);
+ 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);
}
-static int get_parent(char *name, unsigned char *result, int idx)
-{
- unsigned char sha1[20];
- int ret = get_extended_sha1(name, sha1);
- struct commit *commit;
- struct commit_list *p;
-
- if (ret)
- return ret;
- commit = lookup_commit_reference(sha1);
- if (!commit)
- return -1;
- if (parse_commit(commit))
- return -1;
- p = commit->parents;
- while (p) {
- if (!--idx) {
- memcpy(result, p->item->object.sha1, 20);
- return 0;
- }
- p = p->next;
- }
- return -1;
-}
-
-/*
- * This is like "get_sha1()", except it allows "sha1 expressions",
- * notably "xyz^" for "parent of xyz"
- */
-static int get_extended_sha1(char *name, unsigned char *sha1)
-{
- int parent;
- int len = strlen(name);
-
- parent = 1;
- if (len > 2 && name[len-1] >= '1' && name[len-1] <= '9') {
- parent = name[len-1] - '0';
- len--;
- }
- if (len > 1 && name[len-1] == '^') {
- int ret;
- name[len-1] = 0;
- ret = get_parent(name, sha1, parent);
- name[len-1] = '^';
- if (!ret)
- return 0;
- }
- return get_sha1(name, sha1);
-}
-
static void show_default(void)
{
char *s = def;
unsigned char sha1[20];
def = NULL;
- if (!get_extended_sha1(s, sha1)) {
- show_rev(NORMAL, sha1);
+ if (!get_sha1(s, sha1)) {
+ show_rev(NORMAL, sha1, s);
return;
}
show_arg(s);
}
}
+static int show_reference(const char *refname, const unsigned char *sha1)
+{
+ show_rev(NORMAL, sha1, refname);
+ return 0;
+}
+
int main(int argc, char **argv)
{
int i, as_is = 0;
unsigned char sha1[20];
-
+ const char *prefix = setup_git_directory();
+
for (i = 1; i < argc; i++) {
char *arg = argv[i];
char *dotdot;
no_revs = 1;
continue;
}
+ if (!strcmp(arg, "--flags")) {
+ flags_only = 1;
+ continue;
+ }
+ if (!strcmp(arg, "--no-flags")) {
+ no_flags = 1;
+ continue;
+ }
if (!strcmp(arg, "--verify")) {
revs_only = 1;
do_rev_argument = 0;
single_rev = 1;
continue;
}
+ if (!strcmp(arg, "--sq")) {
+ output_sq = 1;
+ continue;
+ }
if (!strcmp(arg, "--not")) {
show_type ^= REVERSED;
continue;
}
+ if (!strcmp(arg, "--symbolic")) {
+ symbolic = 1;
+ continue;
+ }
+ if (!strcmp(arg, "--all")) {
+ for_each_ref(show_reference);
+ continue;
+ }
+ if (!strcmp(arg, "--show-prefix")) {
+ puts(prefix);
+ continue;
+ }
show_arg(arg);
continue;
}
unsigned char end[20];
char *n = dotdot+2;
*dotdot = 0;
- if (!get_extended_sha1(arg, sha1)) {
+ if (!get_sha1(arg, sha1)) {
if (!*n)
n = "HEAD";
- if (!get_extended_sha1(n, end)) {
+ if (!get_sha1(n, end)) {
if (no_revs)
continue;
def = NULL;
- show_rev(NORMAL, end);
- show_rev(REVERSED, sha1);
+ show_rev(NORMAL, end, n);
+ show_rev(REVERSED, sha1, arg);
continue;
}
}
*dotdot = '.';
}
- if (!get_extended_sha1(arg, sha1)) {
+ if (!get_sha1(arg, sha1)) {
if (no_revs)
continue;
def = NULL;
- show_rev(NORMAL, sha1);
+ show_rev(NORMAL, sha1, arg);
continue;
}
- if (*arg == '^' && !get_extended_sha1(arg+1, sha1)) {
+ if (*arg == '^' && !get_sha1(arg+1, sha1)) {
if (no_revs)
continue;
def = NULL;
- show_rev(REVERSED, sha1);
+ show_rev(REVERSED, sha1, arg+1);
continue;
}
show_default();