Hi,
On Mon, 27 Aug 2007, Johannes Schindelin wrote:
> On Mon, 27 Aug 2007, Jeff King wrote:
>
> > On Sun, Aug 26, 2007 at 05:38:22PM +0200, Johannes Schindelin wrote:
> >
> > > The old code _should_ have worked; it is more likely that your
> > > different metric just hides the bug. The old metric tried to favour
> > > less merge traversals over more traversals, but at the same time, it
> > > favoured smaller numbers over larger ones (but as you found out, only
> > > in the last component).
> >
> > Right, the problem is that we have effectively _thrown away_ the
> > "smaller numbers over larger ones" information for components other than
> > the last.
>
> You're right. I misremembered name-rev to use a fifo instead of stupid
> recursion.
>
> Will fix.
Seems that this is not really good (having a fifo):
-- snip --
builtin-name-rev.c | 108 +++++++++++++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 43 deletions(-)
diff --git a/builtin-name-rev.c b/builtin-name-rev.c
index 61eba34..e42e436 100644
--- a/builtin-name-rev.c
+++ b/builtin-name-rev.c
@@ -11,19 +11,22 @@ static const char name_rev_usage[] =
typedef struct rev_name {
const char *tip_name;
- int merge_traversals;
int generation;
} rev_name;
static long cutoff = LONG_MAX;
+/* The parents of these refs are potentially unnamed */
+static struct commit_list *rev_queue, *rev_queue_end;
+
static void name_rev(struct commit *commit,
- const char *tip_name, int merge_traversals, int generation,
+ const char *tip_name, int generation,
int deref)
{
struct rev_name *name = (struct rev_name *)commit->util;
- struct commit_list *parents;
- int parent_number = 1;
+
+ if (commit->util)
+ return;
if (!commit->object.parsed)
parse_commit(commit);
@@ -41,46 +44,20 @@ static void name_rev(struct commit *commit,
die("generation: %d, but deref?", generation);
}
- if (name == NULL) {
- name = xmalloc(sizeof(rev_name));
- commit->util = name;
- 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++) {
- if (parent_number > 1) {
- int len = strlen(tip_name);
- char *new_name = xmalloc(len +
- 1 + decimal_length(generation) + /* ~<n> */
- 1 + 2 + /* ^NN */
- 1);
+ name = xmalloc(sizeof(rev_name));
+ commit->util = name;
+ name->tip_name = tip_name;
+ name->generation = generation;
- if (len > 2 && !strcmp(tip_name + len - 2, "^0"))
- len -= 2;
- if (generation > 0)
- sprintf(new_name, "%.*s~%d^%d", len, tip_name,
- generation, parent_number);
- else
- sprintf(new_name, "%.*s^%d", len, tip_name,
- parent_number);
+ if (rev_queue_end)
+ rev_queue_end = rev_queue_end->next =
+ xmalloc(sizeof(struct commit_list));
+ else
+ rev_queue = rev_queue_end =
+ xmalloc(sizeof(struct commit_list));
- name_rev(parents->item, new_name,
- merge_traversals + 1 , 0, 0);
- } else {
- name_rev(parents->item, tip_name, merge_traversals,
- generation + 1, 0);
- }
- }
+ rev_queue_end->item = commit;
+ rev_queue_end->next = NULL;
}
struct name_ref_data {
@@ -120,11 +97,46 @@ static int name_ref(const char *path, const unsigned char *sha1, int flags, void
else if (!prefixcmp(path, "refs/"))
path = path + 5;
- name_rev(commit, xstrdup(path), 0, 0, deref);
+ name_rev(commit, xstrdup(path), 0, deref);
}
return 0;
}
+static void name_parents(struct commit *commit)
+{
+ struct rev_name *n = commit->util;
+ int parent_number = 1;
+ struct commit_list *parents;
+
+ if (!n)
+ die("Huh?");
+ for (parents = commit->parents;
+ parents;
+ parents = parents->next, parent_number++) {
+ if (parent_number > 1) {
+ int len = strlen(n->tip_name);
+ char *new_name = xmalloc(len +
+ 1 + decimal_length(n->generation) + /* ~<n> */
+ 1 + 2 + /* ^NN */
+ 1);
+
+ if (len > 2 && !strcmp(n->tip_name + len - 2, "^0"))
+ len -= 2;
+ if (n->generation > 0)
+ sprintf(new_name, "%.*s~%d^%d", len,
+ n->tip_name, n->generation,
+ parent_number);
+ else
+ sprintf(new_name, "%.*s^%d", len,
+ n->tip_name, parent_number);
+
+ name_rev(parents->item, new_name, 0, 0);
+ } else
+ name_rev(parents->item, n->tip_name,
+ n->generation + 1, 0);
+ }
+}
+
/* returns a static buffer */
static const char* get_rev_name(struct object *o)
{
@@ -135,6 +147,16 @@ static const char* get_rev_name(struct object *o)
if (o->type != OBJ_COMMIT)
return "undefined";
c = (struct commit *) o;
+ while (c->util == NULL) {
+ struct commit_list *current = rev_queue;
+
+ name_parents(current->item);
+ rev_queue = current->next;
+ if (!rev_queue)
+ rev_queue_end = NULL;
+ free(current);
+ }
+
n = c->util;
if (!n)
return "undefined";
-- snap --
It outputs this:
git name-rev --tags 0567a0c022d5b343370a343121f38fd89925de55
0567a0c[...] tags/v2.6.22-rc1~1^2^2^2~11^2~13^2~8^2~1^3~5
Not really nice.
Ciao,
Dscho
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
