2005-10-26 15:10:20 +02:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include "cache.h"
|
|
|
|
#include "commit.h"
|
|
|
|
#include "tag.h"
|
|
|
|
#include "refs.h"
|
|
|
|
|
|
|
|
static const char name_rev_usage[] =
|
|
|
|
"git-name-rev [--tags] ( --all | --stdin | commitish [commitish...] )\n";
|
|
|
|
|
|
|
|
typedef struct rev_name {
|
|
|
|
const char *tip_name;
|
|
|
|
int merge_traversals;
|
|
|
|
int generation;
|
|
|
|
} rev_name;
|
|
|
|
|
|
|
|
static long cutoff = LONG_MAX;
|
|
|
|
|
|
|
|
static void name_rev(struct commit *commit,
|
|
|
|
const char *tip_name, int merge_traversals, int generation,
|
|
|
|
int deref)
|
|
|
|
{
|
2006-06-18 03:26:18 +02:00
|
|
|
struct rev_name *name = (struct rev_name *)commit->util;
|
2005-10-26 15:10:20 +02:00
|
|
|
struct commit_list *parents;
|
2005-11-29 05:51:44 +01:00
|
|
|
int parent_number = 1;
|
2005-10-26 15:10:20 +02:00
|
|
|
|
|
|
|
if (!commit->object.parsed)
|
|
|
|
parse_commit(commit);
|
|
|
|
|
|
|
|
if (commit->date < cutoff)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (deref) {
|
|
|
|
char *new_name = xmalloc(strlen(tip_name)+3);
|
|
|
|
strcpy(new_name, tip_name);
|
|
|
|
strcat(new_name, "^0");
|
|
|
|
tip_name = new_name;
|
|
|
|
|
|
|
|
if (generation)
|
|
|
|
die("generation: %d, but deref?", generation);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (name == NULL) {
|
|
|
|
name = xmalloc(sizeof(rev_name));
|
2006-06-18 03:26:18 +02:00
|
|
|
commit->util = name;
|
2005-10-26 15:10:20 +02:00
|
|
|
goto copy_data;
|
|
|
|
} else if (name->merge_traversals > merge_traversals ||
|
|
|
|
(name->merge_traversals == merge_traversals &&
|
|
|
|
name->generation > generation)) {
|
|
|
|
copy_data:
|
|
|
|
name->tip_name = tip_name;
|
|
|
|
name->merge_traversals = merge_traversals;
|
|
|
|
name->generation = generation;
|
|
|
|
} else
|
|
|
|
return;
|
|
|
|
|
|
|
|
for (parents = commit->parents;
|
|
|
|
parents;
|
|
|
|
parents = parents->next, parent_number++) {
|
2005-11-29 05:51:44 +01:00
|
|
|
if (parent_number > 1) {
|
2005-10-26 15:10:20 +02:00
|
|
|
char *new_name = xmalloc(strlen(tip_name)+8);
|
|
|
|
|
|
|
|
if (generation > 0)
|
|
|
|
sprintf(new_name, "%s~%d^%d", tip_name,
|
|
|
|
generation, parent_number);
|
|
|
|
else
|
|
|
|
sprintf(new_name, "%s^%d", tip_name, parent_number);
|
|
|
|
|
|
|
|
name_rev(parents->item, new_name,
|
|
|
|
merge_traversals + 1 , 0, 0);
|
|
|
|
} else {
|
|
|
|
name_rev(parents->item, tip_name, merge_traversals,
|
|
|
|
generation + 1, 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int tags_only = 0;
|
|
|
|
|
|
|
|
static int name_ref(const char *path, const unsigned char *sha1)
|
|
|
|
{
|
|
|
|
struct object *o = parse_object(sha1);
|
|
|
|
int deref = 0;
|
|
|
|
|
|
|
|
if (tags_only && strncmp(path, "refs/tags/", 10))
|
|
|
|
return 0;
|
|
|
|
|
Shrink "struct object" a bit
This shrinks "struct object" by a small amount, by getting rid of the
"struct type *" pointer and replacing it with a 3-bit bitfield instead.
In addition, we merge the bitfields and the "flags" field, which
incidentally should also remove a useless 4-byte padding from the object
when in 64-bit mode.
Now, our "struct object" is still too damn large, but it's now less
obviously bloated, and of the remaining fields, only the "util" (which is
not used by most things) is clearly something that should be eventually
discarded.
This shrinks the "git-rev-list --all" memory use by about 2.5% on the
kernel archive (and, perhaps more importantly, on the larger mozilla
archive). That may not sound like much, but I suspect it's more on a
64-bit platform.
There are other remaining inefficiencies (the parent lists, for example,
probably have horrible malloc overhead), but this was pretty obvious.
Most of the patch is just changing the comparison of the "type" pointer
from one of the constant string pointers to the appropriate new TYPE_xxx
small integer constant.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-15 01:45:13 +02:00
|
|
|
while (o && o->type == TYPE_TAG) {
|
2005-10-26 15:10:20 +02:00
|
|
|
struct tag *t = (struct tag *) o;
|
|
|
|
if (!t->tagged)
|
|
|
|
break; /* broken repository */
|
|
|
|
o = parse_object(t->tagged->sha1);
|
|
|
|
deref = 1;
|
|
|
|
}
|
Shrink "struct object" a bit
This shrinks "struct object" by a small amount, by getting rid of the
"struct type *" pointer and replacing it with a 3-bit bitfield instead.
In addition, we merge the bitfields and the "flags" field, which
incidentally should also remove a useless 4-byte padding from the object
when in 64-bit mode.
Now, our "struct object" is still too damn large, but it's now less
obviously bloated, and of the remaining fields, only the "util" (which is
not used by most things) is clearly something that should be eventually
discarded.
This shrinks the "git-rev-list --all" memory use by about 2.5% on the
kernel archive (and, perhaps more importantly, on the larger mozilla
archive). That may not sound like much, but I suspect it's more on a
64-bit platform.
There are other remaining inefficiencies (the parent lists, for example,
probably have horrible malloc overhead), but this was pretty obvious.
Most of the patch is just changing the comparison of the "type" pointer
from one of the constant string pointers to the appropriate new TYPE_xxx
small integer constant.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-15 01:45:13 +02:00
|
|
|
if (o && o->type == TYPE_COMMIT) {
|
2005-10-26 15:10:20 +02:00
|
|
|
struct commit *commit = (struct commit *)o;
|
|
|
|
|
2006-01-11 23:20:09 +01:00
|
|
|
if (!strncmp(path, "refs/heads/", 11))
|
|
|
|
path = path + 11;
|
|
|
|
else if (!strncmp(path, "refs/", 5))
|
|
|
|
path = path + 5;
|
2005-10-26 15:10:20 +02:00
|
|
|
|
|
|
|
name_rev(commit, strdup(path), 0, 0, deref);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* returns a static buffer */
|
|
|
|
static const char* get_rev_name(struct object *o)
|
|
|
|
{
|
|
|
|
static char buffer[1024];
|
2006-06-18 03:26:18 +02:00
|
|
|
struct rev_name *n;
|
|
|
|
struct commit *c;
|
|
|
|
|
|
|
|
if (o->type != TYPE_COMMIT)
|
|
|
|
return "undefined";
|
|
|
|
c = (struct commit *) o;
|
|
|
|
n = c->util;
|
2005-10-26 15:10:20 +02:00
|
|
|
if (!n)
|
|
|
|
return "undefined";
|
|
|
|
|
|
|
|
if (!n->generation)
|
|
|
|
return n->tip_name;
|
|
|
|
|
|
|
|
snprintf(buffer, sizeof(buffer), "%s~%d", n->tip_name, n->generation);
|
|
|
|
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
struct object_list *revs = NULL;
|
|
|
|
struct object_list **walker = &revs;
|
|
|
|
int as_is = 0, all = 0, transform_stdin = 0;
|
|
|
|
|
|
|
|
setup_git_directory();
|
2006-03-24 08:41:18 +01:00
|
|
|
git_config(git_default_config);
|
2005-10-26 15:10:20 +02:00
|
|
|
|
|
|
|
if (argc < 2)
|
|
|
|
usage(name_rev_usage);
|
|
|
|
|
|
|
|
for (--argc, ++argv; argc; --argc, ++argv) {
|
|
|
|
unsigned char sha1[20];
|
|
|
|
struct object *o;
|
|
|
|
struct commit *commit;
|
|
|
|
|
|
|
|
if (!as_is && (*argv)[0] == '-') {
|
|
|
|
if (!strcmp(*argv, "--")) {
|
|
|
|
as_is = 1;
|
|
|
|
continue;
|
|
|
|
} else if (!strcmp(*argv, "--tags")) {
|
|
|
|
tags_only = 1;
|
|
|
|
continue;
|
|
|
|
} else if (!strcmp(*argv, "--all")) {
|
|
|
|
if (argc > 1)
|
|
|
|
die("Specify either a list, or --all, not both!");
|
|
|
|
all = 1;
|
|
|
|
cutoff = 0;
|
|
|
|
continue;
|
|
|
|
} else if (!strcmp(*argv, "--stdin")) {
|
|
|
|
if (argc > 1)
|
|
|
|
die("Specify either a list, or --stdin, not both!");
|
|
|
|
transform_stdin = 1;
|
|
|
|
cutoff = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
usage(name_rev_usage);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (get_sha1(*argv, sha1)) {
|
|
|
|
fprintf(stderr, "Could not get sha1 for %s. Skipping.\n",
|
|
|
|
*argv);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2005-11-03 00:19:13 +01:00
|
|
|
o = deref_tag(parse_object(sha1), *argv, 0);
|
Shrink "struct object" a bit
This shrinks "struct object" by a small amount, by getting rid of the
"struct type *" pointer and replacing it with a 3-bit bitfield instead.
In addition, we merge the bitfields and the "flags" field, which
incidentally should also remove a useless 4-byte padding from the object
when in 64-bit mode.
Now, our "struct object" is still too damn large, but it's now less
obviously bloated, and of the remaining fields, only the "util" (which is
not used by most things) is clearly something that should be eventually
discarded.
This shrinks the "git-rev-list --all" memory use by about 2.5% on the
kernel archive (and, perhaps more importantly, on the larger mozilla
archive). That may not sound like much, but I suspect it's more on a
64-bit platform.
There are other remaining inefficiencies (the parent lists, for example,
probably have horrible malloc overhead), but this was pretty obvious.
Most of the patch is just changing the comparison of the "type" pointer
from one of the constant string pointers to the appropriate new TYPE_xxx
small integer constant.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-15 01:45:13 +02:00
|
|
|
if (!o || o->type != TYPE_COMMIT) {
|
2005-10-26 15:10:20 +02:00
|
|
|
fprintf(stderr, "Could not get commit for %s. Skipping.\n",
|
|
|
|
*argv);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
commit = (struct commit *)o;
|
|
|
|
|
|
|
|
if (cutoff > commit->date)
|
|
|
|
cutoff = commit->date;
|
|
|
|
|
|
|
|
object_list_append((struct object *)commit, walker);
|
|
|
|
(*walker)->name = *argv;
|
|
|
|
walker = &((*walker)->next);
|
|
|
|
}
|
|
|
|
|
|
|
|
for_each_ref(name_ref);
|
|
|
|
|
|
|
|
if (transform_stdin) {
|
|
|
|
char buffer[2048];
|
|
|
|
char *p, *p_start;
|
|
|
|
|
|
|
|
while (!feof(stdin)) {
|
|
|
|
int forty = 0;
|
|
|
|
p = fgets(buffer, sizeof(buffer), stdin);
|
|
|
|
if (!p)
|
|
|
|
break;
|
|
|
|
|
|
|
|
for (p_start = p; *p; p++) {
|
|
|
|
#define ishex(x) (isdigit((x)) || ((x) >= 'a' && (x) <= 'f'))
|
|
|
|
if (!ishex(*p))
|
|
|
|
forty = 0;
|
|
|
|
else if (++forty == 40 &&
|
|
|
|
!ishex(*(p+1))) {
|
|
|
|
unsigned char sha1[40];
|
|
|
|
const char *name = "undefined";
|
|
|
|
char c = *(p+1);
|
|
|
|
|
|
|
|
forty = 0;
|
|
|
|
|
|
|
|
*(p+1) = 0;
|
|
|
|
if (!get_sha1(p - 39, sha1)) {
|
|
|
|
struct object *o =
|
|
|
|
lookup_object(sha1);
|
|
|
|
if (o)
|
|
|
|
name = get_rev_name(o);
|
|
|
|
}
|
|
|
|
*(p+1) = c;
|
|
|
|
|
|
|
|
if (!strcmp(name, "undefined"))
|
|
|
|
continue;
|
|
|
|
|
2005-11-26 08:36:58 +01:00
|
|
|
fwrite(p_start, p - p_start + 1, 1,
|
|
|
|
stdout);
|
|
|
|
printf(" (%s)", name);
|
2005-10-26 15:10:20 +02:00
|
|
|
p_start = p + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* flush */
|
|
|
|
if (p_start != p)
|
|
|
|
fwrite(p_start, p - p_start, 1, stdout);
|
|
|
|
}
|
|
|
|
} else if (all) {
|
|
|
|
int i;
|
|
|
|
|
2006-02-12 02:57:57 +01:00
|
|
|
for (i = 0; i < obj_allocs; i++)
|
|
|
|
if (objs[i])
|
|
|
|
printf("%s %s\n", sha1_to_hex(objs[i]->sha1),
|
|
|
|
get_rev_name(objs[i]));
|
2005-10-26 15:10:20 +02:00
|
|
|
} else
|
|
|
|
for ( ; revs; revs = revs->next)
|
|
|
|
printf("%s %s\n", revs->name, get_rev_name(revs->item));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|