2005-06-07 00:31:29 +04:00
|
|
|
#include "cache.h"
|
2006-12-20 01:34:12 +03:00
|
|
|
#include "refs.h"
|
2006-11-20 00:22:44 +03:00
|
|
|
#include "object.h"
|
|
|
|
#include "tag.h"
|
2007-09-28 19:28:54 +04:00
|
|
|
#include "dir.h"
|
2005-06-07 00:31:29 +04:00
|
|
|
|
2006-11-22 10:36:35 +03:00
|
|
|
/* ISSYMREF=01 and ISPACKED=02 are public interfaces */
|
|
|
|
#define REF_KNOWS_PEELED 04
|
2010-03-16 08:12:55 +03:00
|
|
|
#define REF_BROKEN 010
|
2006-11-22 10:36:35 +03:00
|
|
|
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
struct ref_list {
|
|
|
|
struct ref_list *next;
|
2006-11-22 10:36:35 +03:00
|
|
|
unsigned char flag; /* ISSYMREF? ISPACKED? */
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
unsigned char sha1[20];
|
2006-11-22 10:36:35 +03:00
|
|
|
unsigned char peeled[20];
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
char name[FLEX_ARRAY];
|
|
|
|
};
|
|
|
|
|
2006-11-22 10:36:35 +03:00
|
|
|
static const char *parse_ref_line(char *line, unsigned char *sha1)
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* 42: the answer to everything.
|
|
|
|
*
|
|
|
|
* In this case, it happens to be the answer to
|
|
|
|
* 40 (length of sha1 hex representation)
|
|
|
|
* +1 (space in between hex and name)
|
|
|
|
* +1 (newline at the end of the line)
|
|
|
|
*/
|
|
|
|
int len = strlen(line) - 42;
|
|
|
|
|
|
|
|
if (len <= 0)
|
|
|
|
return NULL;
|
|
|
|
if (get_sha1_hex(line, sha1) < 0)
|
|
|
|
return NULL;
|
|
|
|
if (!isspace(line[40]))
|
|
|
|
return NULL;
|
|
|
|
line += 41;
|
2006-11-22 10:36:35 +03:00
|
|
|
if (isspace(*line))
|
|
|
|
return NULL;
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
if (line[len] != '\n')
|
|
|
|
return NULL;
|
|
|
|
line[len] = 0;
|
2006-11-20 00:22:44 +03:00
|
|
|
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
return line;
|
|
|
|
}
|
|
|
|
|
2006-09-21 09:02:01 +04:00
|
|
|
static struct ref_list *add_ref(const char *name, const unsigned char *sha1,
|
2006-11-22 10:36:35 +03:00
|
|
|
int flag, struct ref_list *list,
|
|
|
|
struct ref_list **new_entry)
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
{
|
|
|
|
int len;
|
2007-04-17 05:42:50 +04:00
|
|
|
struct ref_list *entry;
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
|
|
|
|
/* Allocate it and add it in.. */
|
|
|
|
len = strlen(name) + 1;
|
|
|
|
entry = xmalloc(sizeof(struct ref_list) + len);
|
|
|
|
hashcpy(entry->sha1, sha1);
|
2006-11-22 10:36:35 +03:00
|
|
|
hashclr(entry->peeled);
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
memcpy(entry->name, name, len);
|
2006-09-21 09:02:01 +04:00
|
|
|
entry->flag = flag;
|
2007-04-17 05:42:50 +04:00
|
|
|
entry->next = list;
|
2006-11-22 10:36:35 +03:00
|
|
|
if (new_entry)
|
|
|
|
*new_entry = entry;
|
2007-04-17 05:42:50 +04:00
|
|
|
return entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* merge sort the ref list */
|
|
|
|
static struct ref_list *sort_ref_list(struct ref_list *list)
|
|
|
|
{
|
|
|
|
int psize, qsize, last_merge_count, cmp;
|
|
|
|
struct ref_list *p, *q, *l, *e;
|
|
|
|
struct ref_list *new_list = list;
|
|
|
|
int k = 1;
|
|
|
|
int merge_count = 0;
|
|
|
|
|
|
|
|
if (!list)
|
|
|
|
return list;
|
|
|
|
|
|
|
|
do {
|
|
|
|
last_merge_count = merge_count;
|
|
|
|
merge_count = 0;
|
|
|
|
|
|
|
|
psize = 0;
|
|
|
|
|
|
|
|
p = new_list;
|
|
|
|
q = new_list;
|
|
|
|
new_list = NULL;
|
|
|
|
l = NULL;
|
|
|
|
|
|
|
|
while (p) {
|
|
|
|
merge_count++;
|
|
|
|
|
|
|
|
while (psize < k && q->next) {
|
|
|
|
q = q->next;
|
|
|
|
psize++;
|
|
|
|
}
|
|
|
|
qsize = k;
|
|
|
|
|
|
|
|
while ((psize > 0) || (qsize > 0 && q)) {
|
|
|
|
if (qsize == 0 || !q) {
|
|
|
|
e = p;
|
|
|
|
p = p->next;
|
|
|
|
psize--;
|
|
|
|
} else if (psize == 0) {
|
|
|
|
e = q;
|
|
|
|
q = q->next;
|
|
|
|
qsize--;
|
|
|
|
} else {
|
|
|
|
cmp = strcmp(q->name, p->name);
|
|
|
|
if (cmp < 0) {
|
|
|
|
e = q;
|
|
|
|
q = q->next;
|
|
|
|
qsize--;
|
|
|
|
} else if (cmp > 0) {
|
|
|
|
e = p;
|
|
|
|
p = p->next;
|
|
|
|
psize--;
|
|
|
|
} else {
|
|
|
|
if (hashcmp(q->sha1, p->sha1))
|
|
|
|
die("Duplicated ref, and SHA1s don't match: %s",
|
|
|
|
q->name);
|
|
|
|
warning("Duplicated ref: %s", q->name);
|
|
|
|
e = q;
|
|
|
|
q = q->next;
|
|
|
|
qsize--;
|
|
|
|
free(e);
|
|
|
|
e = p;
|
|
|
|
p = p->next;
|
|
|
|
psize--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
e->next = NULL;
|
|
|
|
|
|
|
|
if (l)
|
|
|
|
l->next = e;
|
|
|
|
if (!new_list)
|
|
|
|
new_list = e;
|
|
|
|
l = e;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = q;
|
|
|
|
};
|
|
|
|
|
|
|
|
k = k * 2;
|
|
|
|
} while ((last_merge_count != merge_count) || (last_merge_count != 1));
|
|
|
|
|
|
|
|
return new_list;
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
}
|
|
|
|
|
2006-09-30 23:37:37 +04:00
|
|
|
/*
|
|
|
|
* Future: need to be in "struct repository"
|
|
|
|
* when doing a full libification.
|
|
|
|
*/
|
2007-06-13 12:42:05 +04:00
|
|
|
static struct cached_refs {
|
2006-09-30 23:37:37 +04:00
|
|
|
char did_loose;
|
|
|
|
char did_packed;
|
|
|
|
struct ref_list *loose;
|
|
|
|
struct ref_list *packed;
|
|
|
|
} cached_refs;
|
2008-02-24 11:07:22 +03:00
|
|
|
static struct ref_list *current_ref;
|
2006-09-30 23:37:37 +04:00
|
|
|
|
2008-04-27 21:39:24 +04:00
|
|
|
static struct ref_list *extra_refs;
|
|
|
|
|
2006-09-30 23:37:37 +04:00
|
|
|
static void free_ref_list(struct ref_list *list)
|
|
|
|
{
|
|
|
|
struct ref_list *next;
|
|
|
|
for ( ; list; list = next) {
|
|
|
|
next = list->next;
|
|
|
|
free(list);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void invalidate_cached_refs(void)
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
{
|
2006-09-30 23:37:37 +04:00
|
|
|
struct cached_refs *ca = &cached_refs;
|
|
|
|
|
|
|
|
if (ca->did_loose && ca->loose)
|
|
|
|
free_ref_list(ca->loose);
|
|
|
|
if (ca->did_packed && ca->packed)
|
|
|
|
free_ref_list(ca->packed);
|
|
|
|
ca->loose = ca->packed = NULL;
|
|
|
|
ca->did_loose = ca->did_packed = 0;
|
|
|
|
}
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
|
2006-11-22 10:36:35 +03:00
|
|
|
static void read_packed_refs(FILE *f, struct cached_refs *cached_refs)
|
|
|
|
{
|
|
|
|
struct ref_list *list = NULL;
|
|
|
|
struct ref_list *last = NULL;
|
|
|
|
char refline[PATH_MAX];
|
|
|
|
int flag = REF_ISPACKED;
|
|
|
|
|
|
|
|
while (fgets(refline, sizeof(refline), f)) {
|
|
|
|
unsigned char sha1[20];
|
|
|
|
const char *name;
|
|
|
|
static const char header[] = "# pack-refs with:";
|
|
|
|
|
|
|
|
if (!strncmp(refline, header, sizeof(header)-1)) {
|
|
|
|
const char *traits = refline + sizeof(header) - 1;
|
|
|
|
if (strstr(traits, " peeled "))
|
|
|
|
flag |= REF_KNOWS_PEELED;
|
|
|
|
/* perhaps other traits later as well */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
name = parse_ref_line(refline, sha1);
|
|
|
|
if (name) {
|
|
|
|
list = add_ref(name, sha1, flag, list, &last);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (last &&
|
|
|
|
refline[0] == '^' &&
|
|
|
|
strlen(refline) == 42 &&
|
|
|
|
refline[41] == '\n' &&
|
|
|
|
!get_sha1_hex(refline + 1, sha1))
|
|
|
|
hashcpy(last->peeled, sha1);
|
|
|
|
}
|
2007-04-17 05:42:50 +04:00
|
|
|
cached_refs->packed = sort_ref_list(list);
|
2006-11-22 10:36:35 +03:00
|
|
|
}
|
|
|
|
|
2008-04-27 21:39:24 +04:00
|
|
|
void add_extra_ref(const char *name, const unsigned char *sha1, int flag)
|
|
|
|
{
|
|
|
|
extra_refs = add_ref(name, sha1, flag, extra_refs, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
void clear_extra_refs(void)
|
|
|
|
{
|
|
|
|
free_ref_list(extra_refs);
|
|
|
|
extra_refs = NULL;
|
|
|
|
}
|
|
|
|
|
2006-09-30 23:37:37 +04:00
|
|
|
static struct ref_list *get_packed_refs(void)
|
|
|
|
{
|
|
|
|
if (!cached_refs.did_packed) {
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
FILE *f = fopen(git_path("packed-refs"), "r");
|
2006-11-22 10:36:35 +03:00
|
|
|
cached_refs.packed = NULL;
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
if (f) {
|
2006-11-22 10:36:35 +03:00
|
|
|
read_packed_refs(f, &cached_refs);
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
fclose(f);
|
|
|
|
}
|
2006-09-30 23:37:37 +04:00
|
|
|
cached_refs.did_packed = 1;
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
}
|
2006-09-30 23:37:37 +04:00
|
|
|
return cached_refs.packed;
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct ref_list *get_ref_dir(const char *base, struct ref_list *list)
|
|
|
|
{
|
|
|
|
DIR *dir = opendir(git_path("%s", base));
|
|
|
|
|
|
|
|
if (dir) {
|
|
|
|
struct dirent *de;
|
|
|
|
int baselen = strlen(base);
|
2006-09-12 07:17:35 +04:00
|
|
|
char *ref = xmalloc(baselen + 257);
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
|
2006-09-12 07:17:35 +04:00
|
|
|
memcpy(ref, base, baselen);
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
if (baselen && base[baselen-1] != '/')
|
2006-09-12 07:17:35 +04:00
|
|
|
ref[baselen++] = '/';
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
|
|
|
|
while ((de = readdir(dir)) != NULL) {
|
|
|
|
unsigned char sha1[20];
|
|
|
|
struct stat st;
|
2006-09-21 09:02:01 +04:00
|
|
|
int flag;
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
int namelen;
|
|
|
|
|
|
|
|
if (de->d_name[0] == '.')
|
|
|
|
continue;
|
|
|
|
namelen = strlen(de->d_name);
|
|
|
|
if (namelen > 255)
|
|
|
|
continue;
|
|
|
|
if (has_extension(de->d_name, ".lock"))
|
|
|
|
continue;
|
2006-09-12 07:17:35 +04:00
|
|
|
memcpy(ref + baselen, de->d_name, namelen+1);
|
|
|
|
if (stat(git_path("%s", ref), &st) < 0)
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
continue;
|
|
|
|
if (S_ISDIR(st.st_mode)) {
|
2006-09-12 07:17:35 +04:00
|
|
|
list = get_ref_dir(ref, list);
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
continue;
|
|
|
|
}
|
2010-03-16 08:12:55 +03:00
|
|
|
if (!resolve_ref(ref, sha1, 1, &flag)) {
|
2009-02-09 10:27:10 +03:00
|
|
|
hashclr(sha1);
|
2010-03-16 08:12:55 +03:00
|
|
|
flag |= REF_BROKEN;
|
|
|
|
}
|
2006-11-22 10:36:35 +03:00
|
|
|
list = add_ref(ref, sha1, flag, list, NULL);
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
}
|
2006-09-12 07:17:35 +04:00
|
|
|
free(ref);
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
closedir(dir);
|
|
|
|
}
|
2007-04-17 05:42:50 +04:00
|
|
|
return sort_ref_list(list);
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
}
|
|
|
|
|
2009-02-09 10:27:10 +03:00
|
|
|
struct warn_if_dangling_data {
|
2009-11-10 08:03:32 +03:00
|
|
|
FILE *fp;
|
2009-02-09 10:27:10 +03:00
|
|
|
const char *refname;
|
|
|
|
const char *msg_fmt;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int warn_if_dangling_symref(const char *refname, const unsigned char *sha1,
|
|
|
|
int flags, void *cb_data)
|
|
|
|
{
|
|
|
|
struct warn_if_dangling_data *d = cb_data;
|
|
|
|
const char *resolves_to;
|
|
|
|
unsigned char junk[20];
|
|
|
|
|
|
|
|
if (!(flags & REF_ISSYMREF))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
resolves_to = resolve_ref(refname, junk, 0, NULL);
|
|
|
|
if (!resolves_to || strcmp(resolves_to, d->refname))
|
|
|
|
return 0;
|
|
|
|
|
2009-11-10 08:03:32 +03:00
|
|
|
fprintf(d->fp, d->msg_fmt, refname);
|
2009-02-09 10:27:10 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-11-10 08:03:32 +03:00
|
|
|
void warn_dangling_symref(FILE *fp, const char *msg_fmt, const char *refname)
|
2009-02-09 10:27:10 +03:00
|
|
|
{
|
2009-11-10 08:03:32 +03:00
|
|
|
struct warn_if_dangling_data data = { fp, refname, msg_fmt };
|
2009-02-09 10:27:10 +03:00
|
|
|
for_each_rawref(warn_if_dangling_symref, &data);
|
|
|
|
}
|
|
|
|
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
static struct ref_list *get_loose_refs(void)
|
|
|
|
{
|
2006-09-30 23:37:37 +04:00
|
|
|
if (!cached_refs.did_loose) {
|
|
|
|
cached_refs.loose = get_ref_dir("refs", NULL);
|
|
|
|
cached_refs.did_loose = 1;
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
}
|
2006-09-30 23:37:37 +04:00
|
|
|
return cached_refs.loose;
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
}
|
|
|
|
|
2005-09-25 20:59:37 +04:00
|
|
|
/* We allow "recursive" symbolic refs. Only within reason, though */
|
|
|
|
#define MAXDEPTH 5
|
2007-04-10 08:14:26 +04:00
|
|
|
#define MAXREFLEN (1024)
|
|
|
|
|
|
|
|
static int resolve_gitlink_packed_ref(char *name, int pathlen, const char *refname, unsigned char *result)
|
|
|
|
{
|
|
|
|
FILE *f;
|
|
|
|
struct cached_refs refs;
|
|
|
|
struct ref_list *ref;
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
strcpy(name + pathlen, "packed-refs");
|
|
|
|
f = fopen(name, "r");
|
|
|
|
if (!f)
|
|
|
|
return -1;
|
|
|
|
read_packed_refs(f, &refs);
|
|
|
|
fclose(f);
|
|
|
|
ref = refs.packed;
|
|
|
|
retval = -1;
|
|
|
|
while (ref) {
|
|
|
|
if (!strcmp(ref->name, refname)) {
|
|
|
|
retval = 0;
|
|
|
|
memcpy(result, ref->sha1, 20);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
ref = ref->next;
|
|
|
|
}
|
|
|
|
free_ref_list(refs.packed);
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int resolve_gitlink_ref_recursive(char *name, int pathlen, const char *refname, unsigned char *result, int recursion)
|
|
|
|
{
|
|
|
|
int fd, len = strlen(refname);
|
|
|
|
char buffer[128], *p;
|
|
|
|
|
|
|
|
if (recursion > MAXDEPTH || len > MAXREFLEN)
|
|
|
|
return -1;
|
|
|
|
memcpy(name + pathlen, refname, len+1);
|
|
|
|
fd = open(name, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
return resolve_gitlink_packed_ref(name, pathlen, refname, result);
|
|
|
|
|
|
|
|
len = read(fd, buffer, sizeof(buffer)-1);
|
|
|
|
close(fd);
|
|
|
|
if (len < 0)
|
|
|
|
return -1;
|
|
|
|
while (len && isspace(buffer[len-1]))
|
|
|
|
len--;
|
|
|
|
buffer[len] = 0;
|
|
|
|
|
|
|
|
/* Was it a detached head or an old-fashioned symlink? */
|
|
|
|
if (!get_sha1_hex(buffer, result))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Symref? */
|
|
|
|
if (strncmp(buffer, "ref:", 4))
|
|
|
|
return -1;
|
|
|
|
p = buffer + 4;
|
|
|
|
while (isspace(*p))
|
|
|
|
p++;
|
|
|
|
|
|
|
|
return resolve_gitlink_ref_recursive(name, pathlen, p, result, recursion+1);
|
|
|
|
}
|
|
|
|
|
|
|
|
int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *result)
|
|
|
|
{
|
|
|
|
int len = strlen(path), retval;
|
|
|
|
char *gitdir;
|
2008-02-21 01:13:14 +03:00
|
|
|
const char *tmp;
|
2007-04-10 08:14:26 +04:00
|
|
|
|
|
|
|
while (len && path[len-1] == '/')
|
|
|
|
len--;
|
|
|
|
if (!len)
|
|
|
|
return -1;
|
|
|
|
gitdir = xmalloc(len + MAXREFLEN + 8);
|
|
|
|
memcpy(gitdir, path, len);
|
2008-02-21 01:13:14 +03:00
|
|
|
memcpy(gitdir + len, "/.git", 6);
|
|
|
|
len += 5;
|
|
|
|
|
|
|
|
tmp = read_gitfile_gently(gitdir);
|
|
|
|
if (tmp) {
|
|
|
|
free(gitdir);
|
|
|
|
len = strlen(tmp);
|
|
|
|
gitdir = xmalloc(len + MAXREFLEN + 3);
|
|
|
|
memcpy(gitdir, tmp, len);
|
|
|
|
}
|
|
|
|
gitdir[len] = '/';
|
|
|
|
gitdir[++len] = '\0';
|
|
|
|
retval = resolve_gitlink_ref_recursive(gitdir, len, refname, result, 0);
|
2007-04-10 08:14:26 +04:00
|
|
|
free(gitdir);
|
|
|
|
return retval;
|
|
|
|
}
|
2005-09-25 20:59:37 +04:00
|
|
|
|
2008-09-09 09:10:56 +04:00
|
|
|
/*
|
|
|
|
* If the "reading" argument is set, this function finds out what _object_
|
|
|
|
* the ref points at by "reading" the ref. The ref, if it is not symbolic,
|
|
|
|
* has to exist, and if it is symbolic, it has to point at an existing ref,
|
|
|
|
* because the "read" goes through the symref to the ref it points at.
|
|
|
|
*
|
|
|
|
* The access that is not "reading" may often be "writing", but does not
|
|
|
|
* have to; it can be merely checking _where it leads to_. If it is a
|
|
|
|
* prelude to "writing" to the ref, a write to a symref that points at
|
|
|
|
* yet-to-be-born ref will create the real ref pointed by the symref.
|
|
|
|
* reading=0 allows the caller to check where such a symref leads to.
|
|
|
|
*/
|
2006-09-21 09:02:01 +04:00
|
|
|
const char *resolve_ref(const char *ref, unsigned char *sha1, int reading, int *flag)
|
2005-07-03 07:23:36 +04:00
|
|
|
{
|
2008-04-27 22:21:58 +04:00
|
|
|
int depth = MAXDEPTH;
|
|
|
|
ssize_t len;
|
2005-10-01 01:08:25 +04:00
|
|
|
char buffer[256];
|
2006-09-12 07:17:35 +04:00
|
|
|
static char ref_buffer[256];
|
2005-09-25 20:59:37 +04:00
|
|
|
|
2006-09-21 09:02:01 +04:00
|
|
|
if (flag)
|
|
|
|
*flag = 0;
|
|
|
|
|
2005-10-01 01:08:25 +04:00
|
|
|
for (;;) {
|
2008-10-27 13:11:40 +03:00
|
|
|
char path[PATH_MAX];
|
2005-10-01 01:08:25 +04:00
|
|
|
struct stat st;
|
|
|
|
char *buf;
|
|
|
|
int fd;
|
2005-07-03 07:23:36 +04:00
|
|
|
|
2005-10-01 01:08:25 +04:00
|
|
|
if (--depth < 0)
|
|
|
|
return NULL;
|
2005-09-25 20:59:37 +04:00
|
|
|
|
2008-10-27 13:11:40 +03:00
|
|
|
git_snpath(path, sizeof(path), "%s", ref);
|
2008-09-09 09:10:56 +04:00
|
|
|
/* Special case: non-existing file. */
|
2005-10-01 01:08:25 +04:00
|
|
|
if (lstat(path, &st) < 0) {
|
Enable the packed refs file format
This actually "turns on" the packed ref file format, now that the
infrastructure to do so sanely exists (ie notably the change to make the
reference reading logic take refnames rather than pathnames to the loose
objects that no longer necessarily even exist).
In particular, when the ref lookup hits a refname that has no loose file
associated with it, it falls back on the packed-ref information. Also, the
ref-locking code, while still using a loose file for the locking itself
(and _creating_ a loose file for the new ref) no longer requires that the
old ref be in such an unpacked state.
Finally, this does a minimal hack to git-checkout.sh to rather than check
the ref-file directly, do a "git-rev-parse" on the "heads/$refname".
That's not really wonderful - we should rather really have a special
routine to verify the names as proper branch head names, but it is a
workable solution for now.
With this, I can literally do something like
git pack-refs
find .git/refs -type f -print0 | xargs -0 rm -f --
and the end result is a largely working repository (ie I've done two
commits - which creates _one_ unpacked ref file - done things like run
"gitk" and "git log" etc, and it all looks ok).
There are probably things missing, but I'm hoping that the missing things
are now of the "small and obvious" kind, and that somebody else might want
to start looking at this too. Hint hint ;)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-14 21:14:47 +04:00
|
|
|
struct ref_list *list = get_packed_refs();
|
|
|
|
while (list) {
|
2006-11-22 10:36:35 +03:00
|
|
|
if (!strcmp(ref, list->name)) {
|
Enable the packed refs file format
This actually "turns on" the packed ref file format, now that the
infrastructure to do so sanely exists (ie notably the change to make the
reference reading logic take refnames rather than pathnames to the loose
objects that no longer necessarily even exist).
In particular, when the ref lookup hits a refname that has no loose file
associated with it, it falls back on the packed-ref information. Also, the
ref-locking code, while still using a loose file for the locking itself
(and _creating_ a loose file for the new ref) no longer requires that the
old ref be in such an unpacked state.
Finally, this does a minimal hack to git-checkout.sh to rather than check
the ref-file directly, do a "git-rev-parse" on the "heads/$refname".
That's not really wonderful - we should rather really have a special
routine to verify the names as proper branch head names, but it is a
workable solution for now.
With this, I can literally do something like
git pack-refs
find .git/refs -type f -print0 | xargs -0 rm -f --
and the end result is a largely working repository (ie I've done two
commits - which creates _one_ unpacked ref file - done things like run
"gitk" and "git log" etc, and it all looks ok).
There are probably things missing, but I'm hoping that the missing things
are now of the "small and obvious" kind, and that somebody else might want
to start looking at this too. Hint hint ;)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-14 21:14:47 +04:00
|
|
|
hashcpy(sha1, list->sha1);
|
2006-09-21 09:02:01 +04:00
|
|
|
if (flag)
|
|
|
|
*flag |= REF_ISPACKED;
|
Enable the packed refs file format
This actually "turns on" the packed ref file format, now that the
infrastructure to do so sanely exists (ie notably the change to make the
reference reading logic take refnames rather than pathnames to the loose
objects that no longer necessarily even exist).
In particular, when the ref lookup hits a refname that has no loose file
associated with it, it falls back on the packed-ref information. Also, the
ref-locking code, while still using a loose file for the locking itself
(and _creating_ a loose file for the new ref) no longer requires that the
old ref be in such an unpacked state.
Finally, this does a minimal hack to git-checkout.sh to rather than check
the ref-file directly, do a "git-rev-parse" on the "heads/$refname".
That's not really wonderful - we should rather really have a special
routine to verify the names as proper branch head names, but it is a
workable solution for now.
With this, I can literally do something like
git pack-refs
find .git/refs -type f -print0 | xargs -0 rm -f --
and the end result is a largely working repository (ie I've done two
commits - which creates _one_ unpacked ref file - done things like run
"gitk" and "git log" etc, and it all looks ok).
There are probably things missing, but I'm hoping that the missing things
are now of the "small and obvious" kind, and that somebody else might want
to start looking at this too. Hint hint ;)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-14 21:14:47 +04:00
|
|
|
return ref;
|
|
|
|
}
|
|
|
|
list = list->next;
|
|
|
|
}
|
2005-10-01 01:08:25 +04:00
|
|
|
if (reading || errno != ENOENT)
|
|
|
|
return NULL;
|
2006-08-23 10:49:00 +04:00
|
|
|
hashclr(sha1);
|
2006-09-12 07:17:35 +04:00
|
|
|
return ref;
|
2005-10-01 01:08:25 +04:00
|
|
|
}
|
2005-09-25 20:59:37 +04:00
|
|
|
|
2005-10-01 01:08:25 +04:00
|
|
|
/* Follow "normalized" - ie "refs/.." symlinks by hand */
|
|
|
|
if (S_ISLNK(st.st_mode)) {
|
|
|
|
len = readlink(path, buffer, sizeof(buffer)-1);
|
|
|
|
if (len >= 5 && !memcmp("refs/", buffer, 5)) {
|
2006-09-12 07:17:35 +04:00
|
|
|
buffer[len] = 0;
|
|
|
|
strcpy(ref_buffer, buffer);
|
|
|
|
ref = ref_buffer;
|
2006-09-21 09:02:01 +04:00
|
|
|
if (flag)
|
|
|
|
*flag |= REF_ISSYMREF;
|
2005-10-01 01:08:25 +04:00
|
|
|
continue;
|
|
|
|
}
|
2005-09-25 20:59:37 +04:00
|
|
|
}
|
2005-10-01 01:08:25 +04:00
|
|
|
|
2006-10-02 21:23:53 +04:00
|
|
|
/* Is it a directory? */
|
|
|
|
if (S_ISDIR(st.st_mode)) {
|
|
|
|
errno = EISDIR;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2005-10-01 01:08:25 +04:00
|
|
|
/*
|
|
|
|
* Anything else, just open it and try to use it as
|
|
|
|
* a ref
|
|
|
|
*/
|
|
|
|
fd = open(path, O_RDONLY);
|
|
|
|
if (fd < 0)
|
|
|
|
return NULL;
|
2007-01-08 18:58:08 +03:00
|
|
|
len = read_in_full(fd, buffer, sizeof(buffer)-1);
|
2005-10-01 01:08:25 +04:00
|
|
|
close(fd);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Is it a symbolic ref?
|
|
|
|
*/
|
|
|
|
if (len < 4 || memcmp("ref:", buffer, 4))
|
|
|
|
break;
|
|
|
|
buf = buffer + 4;
|
|
|
|
len -= 4;
|
|
|
|
while (len && isspace(*buf))
|
|
|
|
buf++, len--;
|
|
|
|
while (len && isspace(buf[len-1]))
|
2006-09-12 07:17:35 +04:00
|
|
|
len--;
|
|
|
|
buf[len] = 0;
|
|
|
|
memcpy(ref_buffer, buf, len + 1);
|
|
|
|
ref = ref_buffer;
|
2006-09-21 09:02:01 +04:00
|
|
|
if (flag)
|
|
|
|
*flag |= REF_ISSYMREF;
|
2005-07-03 07:23:36 +04:00
|
|
|
}
|
2005-10-01 01:08:25 +04:00
|
|
|
if (len < 40 || get_sha1_hex(buffer, sha1))
|
|
|
|
return NULL;
|
2006-09-12 07:17:35 +04:00
|
|
|
return ref;
|
2005-10-01 01:08:25 +04:00
|
|
|
}
|
|
|
|
|
2010-01-20 12:48:25 +03:00
|
|
|
/* The argument to filter_refs */
|
|
|
|
struct ref_filter {
|
|
|
|
const char *pattern;
|
|
|
|
each_ref_fn *fn;
|
|
|
|
void *cb_data;
|
|
|
|
};
|
|
|
|
|
2006-09-12 07:17:35 +04:00
|
|
|
int read_ref(const char *ref, unsigned char *sha1)
|
2005-10-01 01:08:25 +04:00
|
|
|
{
|
2006-09-21 09:02:01 +04:00
|
|
|
if (resolve_ref(ref, sha1, 1, NULL))
|
2005-10-01 01:08:25 +04:00
|
|
|
return 0;
|
|
|
|
return -1;
|
2005-07-03 07:23:36 +04:00
|
|
|
}
|
|
|
|
|
2009-02-09 10:27:10 +03:00
|
|
|
#define DO_FOR_EACH_INCLUDE_BROKEN 01
|
2006-11-19 09:13:33 +03:00
|
|
|
static int do_one_ref(const char *base, each_ref_fn fn, int trim,
|
2009-02-09 10:27:10 +03:00
|
|
|
int flags, void *cb_data, struct ref_list *entry)
|
2006-11-19 09:13:33 +03:00
|
|
|
{
|
|
|
|
if (strncmp(base, entry->name, trim))
|
|
|
|
return 0;
|
2010-03-16 08:12:55 +03:00
|
|
|
|
2009-02-09 10:27:10 +03:00
|
|
|
if (!(flags & DO_FOR_EACH_INCLUDE_BROKEN)) {
|
2010-03-16 08:12:55 +03:00
|
|
|
if (entry->flag & REF_BROKEN)
|
|
|
|
return 0; /* ignore dangling symref */
|
2009-02-09 10:27:10 +03:00
|
|
|
if (!has_sha1_file(entry->sha1)) {
|
|
|
|
error("%s does not point to a valid object!", entry->name);
|
|
|
|
return 0;
|
|
|
|
}
|
2006-11-19 09:13:33 +03:00
|
|
|
}
|
2008-02-24 11:07:22 +03:00
|
|
|
current_ref = entry;
|
2006-11-19 09:13:33 +03:00
|
|
|
return fn(entry->name + trim, entry->sha1, entry->flag, cb_data);
|
|
|
|
}
|
|
|
|
|
2010-01-20 12:48:25 +03:00
|
|
|
static int filter_refs(const char *ref, const unsigned char *sha, int flags,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct ref_filter *filter = (struct ref_filter *)data;
|
|
|
|
if (fnmatch(filter->pattern, ref, 0))
|
|
|
|
return 0;
|
|
|
|
return filter->fn(ref, sha, flags, filter->cb_data);
|
|
|
|
}
|
|
|
|
|
2006-11-20 00:22:44 +03:00
|
|
|
int peel_ref(const char *ref, unsigned char *sha1)
|
|
|
|
{
|
|
|
|
int flag;
|
|
|
|
unsigned char base[20];
|
|
|
|
struct object *o;
|
|
|
|
|
2008-02-24 11:07:22 +03:00
|
|
|
if (current_ref && (current_ref->name == ref
|
|
|
|
|| !strcmp(current_ref->name, ref))) {
|
|
|
|
if (current_ref->flag & REF_KNOWS_PEELED) {
|
|
|
|
hashcpy(sha1, current_ref->peeled);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
hashcpy(base, current_ref->sha1);
|
|
|
|
goto fallback;
|
|
|
|
}
|
|
|
|
|
2006-11-20 00:22:44 +03:00
|
|
|
if (!resolve_ref(ref, base, 1, &flag))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if ((flag & REF_ISPACKED)) {
|
|
|
|
struct ref_list *list = get_packed_refs();
|
|
|
|
|
|
|
|
while (list) {
|
2006-11-22 10:36:35 +03:00
|
|
|
if (!strcmp(list->name, ref)) {
|
|
|
|
if (list->flag & REF_KNOWS_PEELED) {
|
|
|
|
hashcpy(sha1, list->peeled);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/* older pack-refs did not leave peeled ones */
|
|
|
|
break;
|
2006-11-20 00:22:44 +03:00
|
|
|
}
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-02-24 11:07:22 +03:00
|
|
|
fallback:
|
2006-11-20 00:22:44 +03:00
|
|
|
o = parse_object(base);
|
2008-02-24 11:07:19 +03:00
|
|
|
if (o && o->type == OBJ_TAG) {
|
2006-11-20 00:22:44 +03:00
|
|
|
o = deref_tag(o, ref, 0);
|
|
|
|
if (o) {
|
|
|
|
hashcpy(sha1, o->sha1);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2006-09-21 09:02:01 +04:00
|
|
|
static int do_for_each_ref(const char *base, each_ref_fn fn, int trim,
|
2009-02-09 10:27:10 +03:00
|
|
|
int flags, void *cb_data)
|
2005-07-03 07:23:36 +04:00
|
|
|
{
|
2008-02-24 11:07:22 +03:00
|
|
|
int retval = 0;
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
struct ref_list *packed = get_packed_refs();
|
|
|
|
struct ref_list *loose = get_loose_refs();
|
2005-07-03 07:23:36 +04:00
|
|
|
|
2008-04-27 21:39:24 +04:00
|
|
|
struct ref_list *extra;
|
|
|
|
|
|
|
|
for (extra = extra_refs; extra; extra = extra->next)
|
2009-02-09 10:27:10 +03:00
|
|
|
retval = do_one_ref(base, fn, trim, flags, cb_data, extra);
|
2008-04-27 21:39:24 +04:00
|
|
|
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
while (packed && loose) {
|
|
|
|
struct ref_list *entry;
|
|
|
|
int cmp = strcmp(packed->name, loose->name);
|
|
|
|
if (!cmp) {
|
|
|
|
packed = packed->next;
|
|
|
|
continue;
|
2005-07-05 02:28:19 +04:00
|
|
|
}
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
if (cmp > 0) {
|
|
|
|
entry = loose;
|
|
|
|
loose = loose->next;
|
|
|
|
} else {
|
|
|
|
entry = packed;
|
|
|
|
packed = packed->next;
|
|
|
|
}
|
2009-02-09 10:27:10 +03:00
|
|
|
retval = do_one_ref(base, fn, trim, flags, cb_data, entry);
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
if (retval)
|
2008-02-24 11:07:22 +03:00
|
|
|
goto end_each;
|
Start handling references internally as a sorted in-memory list
This also adds some very rudimentary support for the notion of packed
refs. HOWEVER! At this point it isn't used to actually look up a ref
yet, only for listing them (ie "for_each_ref()" and friends see the
packed refs, but none of the other single-ref lookup routines).
Note how we keep two separate lists: one for the loose refs, and one for
the packed refs we read. That's so that we can easily keep the two apart,
and read only one set or the other (and still always make sure that the
loose refs take precedence).
[ From this, it's not actually obvious why we'd keep the two separate
lists, but it's important to have the packed refs on their own list
later on, when I add support for looking up a single loose one.
For that case, we will want to read _just_ the packed refs in case the
single-ref lookup fails, yet we may end up needing the other list at
some point in the future, so keeping them separated is important ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-12 03:37:32 +04:00
|
|
|
}
|
2005-07-03 07:23:36 +04:00
|
|
|
|
2006-11-19 09:13:33 +03:00
|
|
|
for (packed = packed ? packed : loose; packed; packed = packed->next) {
|
2009-02-09 10:27:10 +03:00
|
|
|
retval = do_one_ref(base, fn, trim, flags, cb_data, packed);
|
2006-11-19 09:13:33 +03:00
|
|
|
if (retval)
|
2008-02-24 11:07:22 +03:00
|
|
|
goto end_each;
|
2005-07-03 07:23:36 +04:00
|
|
|
}
|
2008-02-24 11:07:22 +03:00
|
|
|
|
|
|
|
end_each:
|
|
|
|
current_ref = NULL;
|
|
|
|
return retval;
|
2005-07-03 07:23:36 +04:00
|
|
|
}
|
|
|
|
|
2006-09-21 08:47:42 +04:00
|
|
|
int head_ref(each_ref_fn fn, void *cb_data)
|
2005-07-05 22:31:32 +04:00
|
|
|
{
|
|
|
|
unsigned char sha1[20];
|
2006-09-21 09:02:01 +04:00
|
|
|
int flag;
|
|
|
|
|
|
|
|
if (resolve_ref("HEAD", sha1, 1, &flag))
|
|
|
|
return fn("HEAD", sha1, flag, cb_data);
|
2005-07-06 02:45:00 +04:00
|
|
|
return 0;
|
2005-07-05 22:31:32 +04:00
|
|
|
}
|
|
|
|
|
2006-09-21 08:47:42 +04:00
|
|
|
int for_each_ref(each_ref_fn fn, void *cb_data)
|
2005-07-03 07:23:36 +04:00
|
|
|
{
|
2009-02-09 10:27:10 +03:00
|
|
|
return do_for_each_ref("refs/", fn, 0, 0, cb_data);
|
2006-05-14 05:43:00 +04:00
|
|
|
}
|
|
|
|
|
2009-03-30 07:07:15 +04:00
|
|
|
int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
|
|
|
|
{
|
|
|
|
return do_for_each_ref(prefix, fn, strlen(prefix), 0, cb_data);
|
|
|
|
}
|
|
|
|
|
2006-09-21 08:47:42 +04:00
|
|
|
int for_each_tag_ref(each_ref_fn fn, void *cb_data)
|
2006-05-14 05:43:00 +04:00
|
|
|
{
|
2009-03-30 07:07:15 +04:00
|
|
|
return for_each_ref_in("refs/tags/", fn, cb_data);
|
2006-05-14 05:43:00 +04:00
|
|
|
}
|
|
|
|
|
2006-09-21 08:47:42 +04:00
|
|
|
int for_each_branch_ref(each_ref_fn fn, void *cb_data)
|
2006-05-14 05:43:00 +04:00
|
|
|
{
|
2009-03-30 07:07:15 +04:00
|
|
|
return for_each_ref_in("refs/heads/", fn, cb_data);
|
2006-05-14 05:43:00 +04:00
|
|
|
}
|
|
|
|
|
2006-09-21 08:47:42 +04:00
|
|
|
int for_each_remote_ref(each_ref_fn fn, void *cb_data)
|
2006-05-14 05:43:00 +04:00
|
|
|
{
|
2009-03-30 07:07:15 +04:00
|
|
|
return for_each_ref_in("refs/remotes/", fn, cb_data);
|
2009-02-09 10:27:10 +03:00
|
|
|
}
|
|
|
|
|
2009-01-23 12:06:38 +03:00
|
|
|
int for_each_replace_ref(each_ref_fn fn, void *cb_data)
|
|
|
|
{
|
|
|
|
return do_for_each_ref("refs/replace/", fn, 13, 0, cb_data);
|
|
|
|
}
|
|
|
|
|
2010-01-20 12:48:26 +03:00
|
|
|
int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
|
|
|
|
const char *prefix, void *cb_data)
|
2010-01-20 12:48:25 +03:00
|
|
|
{
|
|
|
|
struct strbuf real_pattern = STRBUF_INIT;
|
|
|
|
struct ref_filter filter;
|
|
|
|
int ret;
|
|
|
|
|
2010-01-20 12:48:26 +03:00
|
|
|
if (!prefix && prefixcmp(pattern, "refs/"))
|
2010-01-20 12:48:25 +03:00
|
|
|
strbuf_addstr(&real_pattern, "refs/");
|
2010-01-20 12:48:26 +03:00
|
|
|
else if (prefix)
|
|
|
|
strbuf_addstr(&real_pattern, prefix);
|
2010-01-20 12:48:25 +03:00
|
|
|
strbuf_addstr(&real_pattern, pattern);
|
|
|
|
|
2010-03-12 20:04:26 +03:00
|
|
|
if (!has_glob_specials(pattern)) {
|
2010-02-04 08:23:18 +03:00
|
|
|
/* Append implied '/' '*' if not present. */
|
2010-01-20 12:48:25 +03:00
|
|
|
if (real_pattern.buf[real_pattern.len - 1] != '/')
|
|
|
|
strbuf_addch(&real_pattern, '/');
|
|
|
|
/* No need to check for '*', there is none. */
|
|
|
|
strbuf_addch(&real_pattern, '*');
|
|
|
|
}
|
|
|
|
|
|
|
|
filter.pattern = real_pattern.buf;
|
|
|
|
filter.fn = fn;
|
|
|
|
filter.cb_data = cb_data;
|
|
|
|
ret = for_each_ref(filter_refs, &filter);
|
|
|
|
|
|
|
|
strbuf_release(&real_pattern);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-01-20 12:48:26 +03:00
|
|
|
int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data)
|
|
|
|
{
|
|
|
|
return for_each_glob_ref_in(fn, pattern, NULL, cb_data);
|
|
|
|
}
|
|
|
|
|
2009-02-09 10:27:10 +03:00
|
|
|
int for_each_rawref(each_ref_fn fn, void *cb_data)
|
|
|
|
{
|
|
|
|
return do_for_each_ref("refs/", fn, 0,
|
|
|
|
DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
|
2005-07-03 07:23:36 +04:00
|
|
|
}
|
|
|
|
|
2005-10-14 05:57:39 +04:00
|
|
|
/*
|
|
|
|
* Make sure "ref" is something reasonable to have under ".git/refs/";
|
|
|
|
* We do not like it if:
|
|
|
|
*
|
|
|
|
* - any path component of it begins with ".", or
|
|
|
|
* - it has double dots "..", or
|
|
|
|
* - it has ASCII control character, "~", "^", ":" or SP, anywhere, or
|
|
|
|
* - it ends with a "/".
|
2009-03-25 02:31:01 +03:00
|
|
|
* - it ends with ".lock"
|
2009-05-08 09:32:37 +04:00
|
|
|
* - it contains a "\" (backslash)
|
2005-10-14 05:57:39 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static inline int bad_ref_char(int ch)
|
|
|
|
{
|
2007-05-25 09:20:56 +04:00
|
|
|
if (((unsigned) ch) <= ' ' ||
|
2009-05-08 09:32:37 +04:00
|
|
|
ch == '~' || ch == '^' || ch == ':' || ch == '\\')
|
2007-05-25 09:20:56 +04:00
|
|
|
return 1;
|
|
|
|
/* 2.13 Pattern Matching Notation */
|
|
|
|
if (ch == '?' || ch == '[') /* Unsupported */
|
|
|
|
return 1;
|
|
|
|
if (ch == '*') /* Supported at the end */
|
|
|
|
return 2;
|
|
|
|
return 0;
|
2005-10-14 05:57:39 +04:00
|
|
|
}
|
|
|
|
|
2005-06-07 00:31:29 +04:00
|
|
|
int check_ref_format(const char *ref)
|
|
|
|
{
|
check_ref_format(): tighten refname rules
This changes the rules for refnames to forbid:
(1) a refname that contains "@{" in it.
Some people and foreign SCM converter may have named their branches
as frotz@24 and we still want to keep supporting it.
However, "git branch frotz@{24}" is a disaster. It cannot even
checked out because "git checkout frotz@{24}" will interpret it as
"detach the HEAD at twenty-fourth reflog entry of the frotz branch".
(2) a refname that ends with a dot.
We already reject a path component that begins with a dot, primarily
to avoid ambiguous range interpretation. If we allowed ".B" as a
valid ref, it is unclear if "A...B" means "in dot-B but not in A" or
"either in A or B but not in both".
But for this to be complete, we need also to forbid "A." to avoid "in
B but not in A-dot". This was not a problem in the original range
notation, but we should have added this restriction when three-dot
notation was introduced.
Unlike "no dot at the beginning of any path component" rule, this
rule does not have to be "no dot at the end of any path component",
because you cannot abbreviate the tail end away, similar to you can
say "dot-B" to mean "refs/heads/dot-B".
For these reasons, it is not likely people created branches with these
names on purpose, but we have allowed such names to be used for quite some
time, and it is possible that people created such branches by mistake or
by accident.
To help people with branches with such unfortunate names to recover,
we still allow "branch -d 'bad.'" to delete such branches, and also allow
"branch -m bad. good" to rename them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-21 23:27:31 +03:00
|
|
|
int ch, level, bad_type, last;
|
2009-03-07 09:11:39 +03:00
|
|
|
int ret = CHECK_REF_FORMAT_OK;
|
2005-10-14 05:57:39 +04:00
|
|
|
const char *cp = ref;
|
|
|
|
|
|
|
|
level = 0;
|
|
|
|
while (1) {
|
|
|
|
while ((ch = *cp++) == '/')
|
|
|
|
; /* tolerate duplicated slashes */
|
|
|
|
if (!ch)
|
2008-01-02 09:33:20 +03:00
|
|
|
/* should not end with slashes */
|
|
|
|
return CHECK_REF_FORMAT_ERROR;
|
2005-10-14 05:57:39 +04:00
|
|
|
|
|
|
|
/* we are at the beginning of the path component */
|
2007-05-25 09:20:56 +04:00
|
|
|
if (ch == '.')
|
2008-01-02 09:33:20 +03:00
|
|
|
return CHECK_REF_FORMAT_ERROR;
|
2007-05-25 09:20:56 +04:00
|
|
|
bad_type = bad_ref_char(ch);
|
|
|
|
if (bad_type) {
|
2009-03-07 09:11:39 +03:00
|
|
|
if (bad_type == 2 && (!*cp || *cp == '/') &&
|
|
|
|
ret == CHECK_REF_FORMAT_OK)
|
|
|
|
ret = CHECK_REF_FORMAT_WILDCARD;
|
|
|
|
else
|
|
|
|
return CHECK_REF_FORMAT_ERROR;
|
2007-05-25 09:20:56 +04:00
|
|
|
}
|
2005-10-14 05:57:39 +04:00
|
|
|
|
check_ref_format(): tighten refname rules
This changes the rules for refnames to forbid:
(1) a refname that contains "@{" in it.
Some people and foreign SCM converter may have named their branches
as frotz@24 and we still want to keep supporting it.
However, "git branch frotz@{24}" is a disaster. It cannot even
checked out because "git checkout frotz@{24}" will interpret it as
"detach the HEAD at twenty-fourth reflog entry of the frotz branch".
(2) a refname that ends with a dot.
We already reject a path component that begins with a dot, primarily
to avoid ambiguous range interpretation. If we allowed ".B" as a
valid ref, it is unclear if "A...B" means "in dot-B but not in A" or
"either in A or B but not in both".
But for this to be complete, we need also to forbid "A." to avoid "in
B but not in A-dot". This was not a problem in the original range
notation, but we should have added this restriction when three-dot
notation was introduced.
Unlike "no dot at the beginning of any path component" rule, this
rule does not have to be "no dot at the end of any path component",
because you cannot abbreviate the tail end away, similar to you can
say "dot-B" to mean "refs/heads/dot-B".
For these reasons, it is not likely people created branches with these
names on purpose, but we have allowed such names to be used for quite some
time, and it is possible that people created such branches by mistake or
by accident.
To help people with branches with such unfortunate names to recover,
we still allow "branch -d 'bad.'" to delete such branches, and also allow
"branch -m bad. good" to rename them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-21 23:27:31 +03:00
|
|
|
last = ch;
|
2005-10-14 05:57:39 +04:00
|
|
|
/* scan the rest of the path component */
|
|
|
|
while ((ch = *cp++) != 0) {
|
2007-05-25 09:20:56 +04:00
|
|
|
bad_type = bad_ref_char(ch);
|
check_ref_format(): tighten refname rules
This changes the rules for refnames to forbid:
(1) a refname that contains "@{" in it.
Some people and foreign SCM converter may have named their branches
as frotz@24 and we still want to keep supporting it.
However, "git branch frotz@{24}" is a disaster. It cannot even
checked out because "git checkout frotz@{24}" will interpret it as
"detach the HEAD at twenty-fourth reflog entry of the frotz branch".
(2) a refname that ends with a dot.
We already reject a path component that begins with a dot, primarily
to avoid ambiguous range interpretation. If we allowed ".B" as a
valid ref, it is unclear if "A...B" means "in dot-B but not in A" or
"either in A or B but not in both".
But for this to be complete, we need also to forbid "A." to avoid "in
B but not in A-dot". This was not a problem in the original range
notation, but we should have added this restriction when three-dot
notation was introduced.
Unlike "no dot at the beginning of any path component" rule, this
rule does not have to be "no dot at the end of any path component",
because you cannot abbreviate the tail end away, similar to you can
say "dot-B" to mean "refs/heads/dot-B".
For these reasons, it is not likely people created branches with these
names on purpose, but we have allowed such names to be used for quite some
time, and it is possible that people created such branches by mistake or
by accident.
To help people with branches with such unfortunate names to recover,
we still allow "branch -d 'bad.'" to delete such branches, and also allow
"branch -m bad. good" to rename them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-21 23:27:31 +03:00
|
|
|
if (bad_type)
|
2009-03-07 09:11:36 +03:00
|
|
|
return CHECK_REF_FORMAT_ERROR;
|
2005-10-14 05:57:39 +04:00
|
|
|
if (ch == '/')
|
|
|
|
break;
|
check_ref_format(): tighten refname rules
This changes the rules for refnames to forbid:
(1) a refname that contains "@{" in it.
Some people and foreign SCM converter may have named their branches
as frotz@24 and we still want to keep supporting it.
However, "git branch frotz@{24}" is a disaster. It cannot even
checked out because "git checkout frotz@{24}" will interpret it as
"detach the HEAD at twenty-fourth reflog entry of the frotz branch".
(2) a refname that ends with a dot.
We already reject a path component that begins with a dot, primarily
to avoid ambiguous range interpretation. If we allowed ".B" as a
valid ref, it is unclear if "A...B" means "in dot-B but not in A" or
"either in A or B but not in both".
But for this to be complete, we need also to forbid "A." to avoid "in
B but not in A-dot". This was not a problem in the original range
notation, but we should have added this restriction when three-dot
notation was introduced.
Unlike "no dot at the beginning of any path component" rule, this
rule does not have to be "no dot at the end of any path component",
because you cannot abbreviate the tail end away, similar to you can
say "dot-B" to mean "refs/heads/dot-B".
For these reasons, it is not likely people created branches with these
names on purpose, but we have allowed such names to be used for quite some
time, and it is possible that people created such branches by mistake or
by accident.
To help people with branches with such unfortunate names to recover,
we still allow "branch -d 'bad.'" to delete such branches, and also allow
"branch -m bad. good" to rename them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-21 23:27:31 +03:00
|
|
|
if (last == '.' && ch == '.')
|
|
|
|
return CHECK_REF_FORMAT_ERROR;
|
|
|
|
if (last == '@' && ch == '{')
|
2008-01-02 09:33:20 +03:00
|
|
|
return CHECK_REF_FORMAT_ERROR;
|
check_ref_format(): tighten refname rules
This changes the rules for refnames to forbid:
(1) a refname that contains "@{" in it.
Some people and foreign SCM converter may have named their branches
as frotz@24 and we still want to keep supporting it.
However, "git branch frotz@{24}" is a disaster. It cannot even
checked out because "git checkout frotz@{24}" will interpret it as
"detach the HEAD at twenty-fourth reflog entry of the frotz branch".
(2) a refname that ends with a dot.
We already reject a path component that begins with a dot, primarily
to avoid ambiguous range interpretation. If we allowed ".B" as a
valid ref, it is unclear if "A...B" means "in dot-B but not in A" or
"either in A or B but not in both".
But for this to be complete, we need also to forbid "A." to avoid "in
B but not in A-dot". This was not a problem in the original range
notation, but we should have added this restriction when three-dot
notation was introduced.
Unlike "no dot at the beginning of any path component" rule, this
rule does not have to be "no dot at the end of any path component",
because you cannot abbreviate the tail end away, similar to you can
say "dot-B" to mean "refs/heads/dot-B".
For these reasons, it is not likely people created branches with these
names on purpose, but we have allowed such names to be used for quite some
time, and it is possible that people created such branches by mistake or
by accident.
To help people with branches with such unfortunate names to recover,
we still allow "branch -d 'bad.'" to delete such branches, and also allow
"branch -m bad. good" to rename them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-21 23:27:31 +03:00
|
|
|
last = ch;
|
2005-10-14 05:57:39 +04:00
|
|
|
}
|
|
|
|
level++;
|
|
|
|
if (!ch) {
|
check_ref_format(): tighten refname rules
This changes the rules for refnames to forbid:
(1) a refname that contains "@{" in it.
Some people and foreign SCM converter may have named their branches
as frotz@24 and we still want to keep supporting it.
However, "git branch frotz@{24}" is a disaster. It cannot even
checked out because "git checkout frotz@{24}" will interpret it as
"detach the HEAD at twenty-fourth reflog entry of the frotz branch".
(2) a refname that ends with a dot.
We already reject a path component that begins with a dot, primarily
to avoid ambiguous range interpretation. If we allowed ".B" as a
valid ref, it is unclear if "A...B" means "in dot-B but not in A" or
"either in A or B but not in both".
But for this to be complete, we need also to forbid "A." to avoid "in
B but not in A-dot". This was not a problem in the original range
notation, but we should have added this restriction when three-dot
notation was introduced.
Unlike "no dot at the beginning of any path component" rule, this
rule does not have to be "no dot at the end of any path component",
because you cannot abbreviate the tail end away, similar to you can
say "dot-B" to mean "refs/heads/dot-B".
For these reasons, it is not likely people created branches with these
names on purpose, but we have allowed such names to be used for quite some
time, and it is possible that people created such branches by mistake or
by accident.
To help people with branches with such unfortunate names to recover,
we still allow "branch -d 'bad.'" to delete such branches, and also allow
"branch -m bad. good" to rename them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-03-21 23:27:31 +03:00
|
|
|
if (ref <= cp - 2 && cp[-2] == '.')
|
|
|
|
return CHECK_REF_FORMAT_ERROR;
|
2005-10-14 05:57:39 +04:00
|
|
|
if (level < 2)
|
2008-01-02 09:33:20 +03:00
|
|
|
return CHECK_REF_FORMAT_ONELEVEL;
|
2009-03-25 02:31:01 +03:00
|
|
|
if (has_extension(ref, ".lock"))
|
|
|
|
return CHECK_REF_FORMAT_ERROR;
|
2009-03-07 09:11:39 +03:00
|
|
|
return ret;
|
2005-10-14 05:57:39 +04:00
|
|
|
}
|
|
|
|
}
|
2005-06-07 00:31:29 +04:00
|
|
|
}
|
|
|
|
|
2009-05-14 01:22:04 +04:00
|
|
|
const char *prettify_refname(const char *name)
|
2009-03-09 04:06:05 +03:00
|
|
|
{
|
|
|
|
return name + (
|
|
|
|
!prefixcmp(name, "refs/heads/") ? 11 :
|
|
|
|
!prefixcmp(name, "refs/tags/") ? 10 :
|
|
|
|
!prefixcmp(name, "refs/remotes/") ? 13 :
|
|
|
|
0);
|
|
|
|
}
|
|
|
|
|
add refname_match()
We use at least two rulesets for matching abbreviated refnames with
full refnames (starting with 'refs/'). git-rev-parse and git-fetch
use slightly different rules.
This commit introduces a new function refname_match
(const char *abbrev_name, const char *full_name, const char **rules).
abbrev_name is expanded using the rules and matched against full_name.
If a match is found the function returns true. rules is a NULL-terminate
list of format patterns with "%.*s", for example:
const char *ref_rev_parse_rules[] = {
"%.*s",
"refs/%.*s",
"refs/tags/%.*s",
"refs/heads/%.*s",
"refs/remotes/%.*s",
"refs/remotes/%.*s/HEAD",
NULL
};
Asterisks are included in the format strings because this is the form
required in sha1_name.c. Sharing the list with the functions there is
a good idea to avoid duplicating the rules. Hopefully this
facilitates unified matching rules in the future.
This commit makes the rules used by rev-parse for resolving refs to
sha1s available for string comparison. Before this change, the rules
were buried in get_sha1*() and dwim_ref().
A follow-up commit will refactor the rules used by fetch.
refname_match() will be used for matching refspecs in git-send-pack.
Thanks to Daniel Barkalow <barkalow@iabervon.org> for pointing
out that ref_matches_abbrev in remote.c solves a similar problem
and care should be taken to avoid confusion.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-11 17:01:46 +03:00
|
|
|
const char *ref_rev_parse_rules[] = {
|
|
|
|
"%.*s",
|
|
|
|
"refs/%.*s",
|
|
|
|
"refs/tags/%.*s",
|
|
|
|
"refs/heads/%.*s",
|
|
|
|
"refs/remotes/%.*s",
|
|
|
|
"refs/remotes/%.*s/HEAD",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
2007-11-11 17:01:48 +03:00
|
|
|
const char *ref_fetch_rules[] = {
|
|
|
|
"%.*s",
|
|
|
|
"refs/%.*s",
|
|
|
|
"refs/heads/%.*s",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
add refname_match()
We use at least two rulesets for matching abbreviated refnames with
full refnames (starting with 'refs/'). git-rev-parse and git-fetch
use slightly different rules.
This commit introduces a new function refname_match
(const char *abbrev_name, const char *full_name, const char **rules).
abbrev_name is expanded using the rules and matched against full_name.
If a match is found the function returns true. rules is a NULL-terminate
list of format patterns with "%.*s", for example:
const char *ref_rev_parse_rules[] = {
"%.*s",
"refs/%.*s",
"refs/tags/%.*s",
"refs/heads/%.*s",
"refs/remotes/%.*s",
"refs/remotes/%.*s/HEAD",
NULL
};
Asterisks are included in the format strings because this is the form
required in sha1_name.c. Sharing the list with the functions there is
a good idea to avoid duplicating the rules. Hopefully this
facilitates unified matching rules in the future.
This commit makes the rules used by rev-parse for resolving refs to
sha1s available for string comparison. Before this change, the rules
were buried in get_sha1*() and dwim_ref().
A follow-up commit will refactor the rules used by fetch.
refname_match() will be used for matching refspecs in git-send-pack.
Thanks to Daniel Barkalow <barkalow@iabervon.org> for pointing
out that ref_matches_abbrev in remote.c solves a similar problem
and care should be taken to avoid confusion.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-11 17:01:46 +03:00
|
|
|
int refname_match(const char *abbrev_name, const char *full_name, const char **rules)
|
|
|
|
{
|
|
|
|
const char **p;
|
|
|
|
const int abbrev_name_len = strlen(abbrev_name);
|
|
|
|
|
|
|
|
for (p = rules; *p; p++) {
|
|
|
|
if (!strcmp(full_name, mkpath(*p, abbrev_name_len, abbrev_name))) {
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-06-07 01:04:17 +04:00
|
|
|
static struct ref_lock *verify_lock(struct ref_lock *lock,
|
2006-05-17 13:55:02 +04:00
|
|
|
const unsigned char *old_sha1, int mustexist)
|
|
|
|
{
|
2006-09-21 09:02:01 +04:00
|
|
|
if (!resolve_ref(lock->ref_name, lock->old_sha1, mustexist, NULL)) {
|
Enable the packed refs file format
This actually "turns on" the packed ref file format, now that the
infrastructure to do so sanely exists (ie notably the change to make the
reference reading logic take refnames rather than pathnames to the loose
objects that no longer necessarily even exist).
In particular, when the ref lookup hits a refname that has no loose file
associated with it, it falls back on the packed-ref information. Also, the
ref-locking code, while still using a loose file for the locking itself
(and _creating_ a loose file for the new ref) no longer requires that the
old ref be in such an unpacked state.
Finally, this does a minimal hack to git-checkout.sh to rather than check
the ref-file directly, do a "git-rev-parse" on the "heads/$refname".
That's not really wonderful - we should rather really have a special
routine to verify the names as proper branch head names, but it is a
workable solution for now.
With this, I can literally do something like
git pack-refs
find .git/refs -type f -print0 | xargs -0 rm -f --
and the end result is a largely working repository (ie I've done two
commits - which creates _one_ unpacked ref file - done things like run
"gitk" and "git log" etc, and it all looks ok).
There are probably things missing, but I'm hoping that the missing things
are now of the "small and obvious" kind, and that somebody else might want
to start looking at this too. Hint hint ;)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-14 21:14:47 +04:00
|
|
|
error("Can't verify ref %s", lock->ref_name);
|
2006-05-17 13:55:02 +04:00
|
|
|
unlock_ref(lock);
|
|
|
|
return NULL;
|
|
|
|
}
|
2006-08-17 22:54:57 +04:00
|
|
|
if (hashcmp(lock->old_sha1, old_sha1)) {
|
Enable the packed refs file format
This actually "turns on" the packed ref file format, now that the
infrastructure to do so sanely exists (ie notably the change to make the
reference reading logic take refnames rather than pathnames to the loose
objects that no longer necessarily even exist).
In particular, when the ref lookup hits a refname that has no loose file
associated with it, it falls back on the packed-ref information. Also, the
ref-locking code, while still using a loose file for the locking itself
(and _creating_ a loose file for the new ref) no longer requires that the
old ref be in such an unpacked state.
Finally, this does a minimal hack to git-checkout.sh to rather than check
the ref-file directly, do a "git-rev-parse" on the "heads/$refname".
That's not really wonderful - we should rather really have a special
routine to verify the names as proper branch head names, but it is a
workable solution for now.
With this, I can literally do something like
git pack-refs
find .git/refs -type f -print0 | xargs -0 rm -f --
and the end result is a largely working repository (ie I've done two
commits - which creates _one_ unpacked ref file - done things like run
"gitk" and "git log" etc, and it all looks ok).
There are probably things missing, but I'm hoping that the missing things
are now of the "small and obvious" kind, and that somebody else might want
to start looking at this too. Hint hint ;)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-14 21:14:47 +04:00
|
|
|
error("Ref %s is at %s but expected %s", lock->ref_name,
|
2006-05-17 13:55:02 +04:00
|
|
|
sha1_to_hex(lock->old_sha1), sha1_to_hex(old_sha1));
|
|
|
|
unlock_ref(lock);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return lock;
|
|
|
|
}
|
|
|
|
|
2007-09-28 19:28:54 +04:00
|
|
|
static int remove_empty_directories(const char *file)
|
2006-09-30 13:25:30 +04:00
|
|
|
{
|
|
|
|
/* we want to create a file but there is a directory there;
|
|
|
|
* if that is an empty directory (or a directory that contains
|
|
|
|
* only empty directories), remove them.
|
|
|
|
*/
|
2007-09-28 19:28:54 +04:00
|
|
|
struct strbuf path;
|
|
|
|
int result;
|
2006-09-30 13:25:30 +04:00
|
|
|
|
2007-09-28 19:28:54 +04:00
|
|
|
strbuf_init(&path, 20);
|
|
|
|
strbuf_addstr(&path, file);
|
|
|
|
|
2009-07-01 02:33:45 +04:00
|
|
|
result = remove_dir_recursively(&path, REMOVE_DIR_EMPTY_ONLY);
|
2007-09-28 19:28:54 +04:00
|
|
|
|
|
|
|
strbuf_release(&path);
|
|
|
|
|
|
|
|
return result;
|
2006-09-30 13:25:30 +04:00
|
|
|
}
|
|
|
|
|
2006-11-28 17:47:40 +03:00
|
|
|
static int is_refname_available(const char *ref, const char *oldref,
|
|
|
|
struct ref_list *list, int quiet)
|
|
|
|
{
|
|
|
|
int namlen = strlen(ref); /* e.g. 'foo/bar' */
|
|
|
|
while (list) {
|
|
|
|
/* list->name could be 'foo' or 'foo/bar/baz' */
|
|
|
|
if (!oldref || strcmp(oldref, list->name)) {
|
|
|
|
int len = strlen(list->name);
|
|
|
|
int cmplen = (namlen < len) ? namlen : len;
|
|
|
|
const char *lead = (namlen < len) ? list->name : ref;
|
|
|
|
if (!strncmp(ref, list->name, cmplen) &&
|
|
|
|
lead[cmplen] == '/') {
|
|
|
|
if (!quiet)
|
|
|
|
error("'%s' exists; cannot create '%s'",
|
|
|
|
list->name, ref);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-05-09 14:33:20 +04:00
|
|
|
static struct ref_lock *lock_ref_sha1_basic(const char *ref, const unsigned char *old_sha1, int flags, int *type_p)
|
2006-05-17 13:55:02 +04:00
|
|
|
{
|
Enable the packed refs file format
This actually "turns on" the packed ref file format, now that the
infrastructure to do so sanely exists (ie notably the change to make the
reference reading logic take refnames rather than pathnames to the loose
objects that no longer necessarily even exist).
In particular, when the ref lookup hits a refname that has no loose file
associated with it, it falls back on the packed-ref information. Also, the
ref-locking code, while still using a loose file for the locking itself
(and _creating_ a loose file for the new ref) no longer requires that the
old ref be in such an unpacked state.
Finally, this does a minimal hack to git-checkout.sh to rather than check
the ref-file directly, do a "git-rev-parse" on the "heads/$refname".
That's not really wonderful - we should rather really have a special
routine to verify the names as proper branch head names, but it is a
workable solution for now.
With this, I can literally do something like
git pack-refs
find .git/refs -type f -print0 | xargs -0 rm -f --
and the end result is a largely working repository (ie I've done two
commits - which creates _one_ unpacked ref file - done things like run
"gitk" and "git log" etc, and it all looks ok).
There are probably things missing, but I'm hoping that the missing things
are now of the "small and obvious" kind, and that somebody else might want
to start looking at this too. Hint hint ;)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-14 21:14:47 +04:00
|
|
|
char *ref_file;
|
2006-09-12 07:17:35 +04:00
|
|
|
const char *orig_ref = ref;
|
2006-05-17 13:55:02 +04:00
|
|
|
struct ref_lock *lock;
|
2006-10-01 01:14:31 +04:00
|
|
|
int last_errno = 0;
|
2008-10-18 02:44:39 +04:00
|
|
|
int type, lflags;
|
2006-09-27 12:09:18 +04:00
|
|
|
int mustexist = (old_sha1 && !is_null_sha1(old_sha1));
|
2008-11-05 23:55:53 +03:00
|
|
|
int missing = 0;
|
2006-05-17 13:55:02 +04:00
|
|
|
|
|
|
|
lock = xcalloc(1, sizeof(struct ref_lock));
|
|
|
|
lock->lock_fd = -1;
|
|
|
|
|
2007-05-09 14:33:20 +04:00
|
|
|
ref = resolve_ref(ref, lock->old_sha1, mustexist, &type);
|
2006-09-30 13:25:30 +04:00
|
|
|
if (!ref && errno == EISDIR) {
|
|
|
|
/* we are trying to lock foo but we used to
|
|
|
|
* have foo/bar which now does not exist;
|
|
|
|
* it is normal for the empty directory 'foo'
|
|
|
|
* to remain.
|
|
|
|
*/
|
|
|
|
ref_file = git_path("%s", orig_ref);
|
2006-10-01 01:14:31 +04:00
|
|
|
if (remove_empty_directories(ref_file)) {
|
|
|
|
last_errno = errno;
|
|
|
|
error("there are still refs under '%s'", orig_ref);
|
|
|
|
goto error_return;
|
|
|
|
}
|
2007-05-09 14:33:20 +04:00
|
|
|
ref = resolve_ref(orig_ref, lock->old_sha1, mustexist, &type);
|
2006-09-30 13:25:30 +04:00
|
|
|
}
|
2007-05-09 14:33:20 +04:00
|
|
|
if (type_p)
|
|
|
|
*type_p = type;
|
2006-09-12 07:17:35 +04:00
|
|
|
if (!ref) {
|
2006-10-01 01:14:31 +04:00
|
|
|
last_errno = errno;
|
2006-07-29 07:44:51 +04:00
|
|
|
error("unable to resolve reference %s: %s",
|
2006-09-12 07:17:35 +04:00
|
|
|
orig_ref, strerror(errno));
|
2006-10-01 01:14:31 +04:00
|
|
|
goto error_return;
|
2006-05-17 13:55:02 +04:00
|
|
|
}
|
2008-11-05 23:55:53 +03:00
|
|
|
missing = is_null_sha1(lock->old_sha1);
|
2006-11-28 17:47:40 +03:00
|
|
|
/* When the ref did not exist and we are creating it,
|
|
|
|
* make sure there is no existing ref that is packed
|
|
|
|
* whose name begins with our refname, nor a ref whose
|
|
|
|
* name is a proper prefix of our refname.
|
|
|
|
*/
|
2008-11-05 23:55:53 +03:00
|
|
|
if (missing &&
|
2009-05-25 14:37:15 +04:00
|
|
|
!is_refname_available(ref, NULL, get_packed_refs(), 0)) {
|
|
|
|
last_errno = ENOTDIR;
|
2006-11-28 17:47:40 +03:00
|
|
|
goto error_return;
|
2009-05-25 14:37:15 +04:00
|
|
|
}
|
2006-10-01 01:19:25 +04:00
|
|
|
|
2006-06-07 00:54:14 +04:00
|
|
|
lock->lk = xcalloc(1, sizeof(struct lock_file));
|
2006-05-17 13:55:02 +04:00
|
|
|
|
2008-10-18 02:44:39 +04:00
|
|
|
lflags = LOCK_DIE_ON_ERROR;
|
|
|
|
if (flags & REF_NODEREF) {
|
2007-05-09 14:33:20 +04:00
|
|
|
ref = orig_ref;
|
2008-10-18 02:44:39 +04:00
|
|
|
lflags |= LOCK_NODEREF;
|
|
|
|
}
|
Enable the packed refs file format
This actually "turns on" the packed ref file format, now that the
infrastructure to do so sanely exists (ie notably the change to make the
reference reading logic take refnames rather than pathnames to the loose
objects that no longer necessarily even exist).
In particular, when the ref lookup hits a refname that has no loose file
associated with it, it falls back on the packed-ref information. Also, the
ref-locking code, while still using a loose file for the locking itself
(and _creating_ a loose file for the new ref) no longer requires that the
old ref be in such an unpacked state.
Finally, this does a minimal hack to git-checkout.sh to rather than check
the ref-file directly, do a "git-rev-parse" on the "heads/$refname".
That's not really wonderful - we should rather really have a special
routine to verify the names as proper branch head names, but it is a
workable solution for now.
With this, I can literally do something like
git pack-refs
find .git/refs -type f -print0 | xargs -0 rm -f --
and the end result is a largely working repository (ie I've done two
commits - which creates _one_ unpacked ref file - done things like run
"gitk" and "git log" etc, and it all looks ok).
There are probably things missing, but I'm hoping that the missing things
are now of the "small and obvious" kind, and that somebody else might want
to start looking at this too. Hint hint ;)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-14 21:14:47 +04:00
|
|
|
lock->ref_name = xstrdup(ref);
|
2007-01-27 01:26:06 +03:00
|
|
|
lock->orig_ref_name = xstrdup(orig_ref);
|
2006-09-23 03:08:45 +04:00
|
|
|
ref_file = git_path("%s", ref);
|
2008-11-05 23:55:53 +03:00
|
|
|
if (missing)
|
2007-05-09 14:33:20 +04:00
|
|
|
lock->force_write = 1;
|
|
|
|
if ((flags & REF_NODEREF) && (type & REF_ISSYMREF))
|
|
|
|
lock->force_write = 1;
|
2006-05-17 13:55:02 +04:00
|
|
|
|
2006-10-01 01:14:31 +04:00
|
|
|
if (safe_create_leading_directories(ref_file)) {
|
|
|
|
last_errno = errno;
|
|
|
|
error("unable to create directory for %s", ref_file);
|
|
|
|
goto error_return;
|
|
|
|
}
|
2006-05-17 13:55:02 +04:00
|
|
|
|
2008-10-18 02:44:39 +04:00
|
|
|
lock->lock_fd = hold_lock_file_for_update(lock->lk, ref_file, lflags);
|
2006-05-17 13:55:02 +04:00
|
|
|
return old_sha1 ? verify_lock(lock, old_sha1, mustexist) : lock;
|
2006-10-01 01:14:31 +04:00
|
|
|
|
|
|
|
error_return:
|
|
|
|
unlock_ref(lock);
|
|
|
|
errno = last_errno;
|
|
|
|
return NULL;
|
2006-05-17 13:55:02 +04:00
|
|
|
}
|
|
|
|
|
2006-09-27 12:09:18 +04:00
|
|
|
struct ref_lock *lock_ref_sha1(const char *ref, const unsigned char *old_sha1)
|
2005-06-07 00:31:29 +04:00
|
|
|
{
|
2006-09-20 00:58:23 +04:00
|
|
|
char refpath[PATH_MAX];
|
2005-06-07 00:31:29 +04:00
|
|
|
if (check_ref_format(ref))
|
2006-05-17 13:55:02 +04:00
|
|
|
return NULL;
|
2006-09-20 00:58:23 +04:00
|
|
|
strcpy(refpath, mkpath("refs/%s", ref));
|
2007-05-09 14:33:20 +04:00
|
|
|
return lock_ref_sha1_basic(refpath, old_sha1, 0, NULL);
|
2006-05-17 13:55:02 +04:00
|
|
|
}
|
|
|
|
|
2007-05-09 14:33:20 +04:00
|
|
|
struct ref_lock *lock_any_ref_for_update(const char *ref, const unsigned char *old_sha1, int flags)
|
2006-05-17 13:55:02 +04:00
|
|
|
{
|
2008-01-02 09:33:20 +03:00
|
|
|
switch (check_ref_format(ref)) {
|
|
|
|
default:
|
2008-01-02 22:14:40 +03:00
|
|
|
return NULL;
|
|
|
|
case 0:
|
|
|
|
case CHECK_REF_FORMAT_ONELEVEL:
|
2008-01-02 09:33:20 +03:00
|
|
|
return lock_ref_sha1_basic(ref, old_sha1, flags, NULL);
|
|
|
|
}
|
2006-10-01 02:02:00 +04:00
|
|
|
}
|
|
|
|
|
2006-10-01 22:41:00 +04:00
|
|
|
static struct lock_file packlock;
|
|
|
|
|
2006-10-01 02:02:00 +04:00
|
|
|
static int repack_without_ref(const char *refname)
|
|
|
|
{
|
|
|
|
struct ref_list *list, *packed_ref_list;
|
|
|
|
int fd;
|
|
|
|
int found = 0;
|
|
|
|
|
|
|
|
packed_ref_list = get_packed_refs();
|
|
|
|
for (list = packed_ref_list; list; list = list->next) {
|
|
|
|
if (!strcmp(refname, list->name)) {
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!found)
|
|
|
|
return 0;
|
|
|
|
fd = hold_lock_file_for_update(&packlock, git_path("packed-refs"), 0);
|
2009-09-27 03:15:09 +04:00
|
|
|
if (fd < 0) {
|
|
|
|
unable_to_lock_error(git_path("packed-refs"), errno);
|
2006-10-01 02:02:00 +04:00
|
|
|
return error("cannot delete '%s' from packed refs", refname);
|
2009-09-27 03:15:09 +04:00
|
|
|
}
|
2006-10-01 02:02:00 +04:00
|
|
|
|
|
|
|
for (list = packed_ref_list; list; list = list->next) {
|
|
|
|
char line[PATH_MAX + 100];
|
|
|
|
int len;
|
|
|
|
|
|
|
|
if (!strcmp(refname, list->name))
|
|
|
|
continue;
|
|
|
|
len = snprintf(line, sizeof(line), "%s %s\n",
|
|
|
|
sha1_to_hex(list->sha1), list->name);
|
|
|
|
/* this should not happen but just being defensive */
|
|
|
|
if (len > sizeof(line))
|
|
|
|
die("too long a refname '%s'", list->name);
|
|
|
|
write_or_die(fd, line, len);
|
|
|
|
}
|
|
|
|
return commit_lock_file(&packlock);
|
|
|
|
}
|
|
|
|
|
2008-10-26 05:33:56 +03:00
|
|
|
int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
|
2006-10-01 02:02:00 +04:00
|
|
|
{
|
|
|
|
struct ref_lock *lock;
|
2008-10-26 05:33:56 +03:00
|
|
|
int err, i = 0, ret = 0, flag = 0;
|
2006-10-01 02:02:00 +04:00
|
|
|
|
2007-05-09 14:33:20 +04:00
|
|
|
lock = lock_ref_sha1_basic(refname, sha1, 0, &flag);
|
2006-10-01 02:02:00 +04:00
|
|
|
if (!lock)
|
|
|
|
return 1;
|
2008-11-01 02:25:44 +03:00
|
|
|
if (!(flag & REF_ISPACKED) || flag & REF_ISSYMREF) {
|
2006-10-01 02:02:00 +04:00
|
|
|
/* loose */
|
2008-10-26 05:33:56 +03:00
|
|
|
const char *path;
|
|
|
|
|
|
|
|
if (!(delopt & REF_NODEREF)) {
|
|
|
|
i = strlen(lock->lk->filename) - 5; /* .lock */
|
|
|
|
lock->lk->filename[i] = 0;
|
|
|
|
path = lock->lk->filename;
|
|
|
|
} else {
|
2008-11-11 00:07:52 +03:00
|
|
|
path = git_path("%s", refname);
|
2008-10-26 05:33:56 +03:00
|
|
|
}
|
2009-04-30 01:22:56 +04:00
|
|
|
err = unlink_or_warn(path);
|
|
|
|
if (err && errno != ENOENT)
|
2006-10-01 02:02:00 +04:00
|
|
|
ret = 1;
|
2009-04-30 01:22:56 +04:00
|
|
|
|
2008-10-26 05:33:56 +03:00
|
|
|
if (!(delopt & REF_NODEREF))
|
|
|
|
lock->lk->filename[i] = '.';
|
2006-10-01 02:02:00 +04:00
|
|
|
}
|
|
|
|
/* removing the loose one could have resurrected an earlier
|
|
|
|
* packed one. Also, if it was not loose we need to repack
|
|
|
|
* without it.
|
|
|
|
*/
|
|
|
|
ret |= repack_without_ref(refname);
|
|
|
|
|
2009-04-30 01:22:56 +04:00
|
|
|
unlink_or_warn(git_path("logs/%s", lock->ref_name));
|
2006-10-01 02:02:00 +04:00
|
|
|
invalidate_cached_refs();
|
|
|
|
unlock_ref(lock);
|
|
|
|
return ret;
|
2006-05-17 13:55:02 +04:00
|
|
|
}
|
|
|
|
|
2006-11-30 05:16:56 +03:00
|
|
|
int rename_ref(const char *oldref, const char *newref, const char *logmsg)
|
2006-11-28 17:47:40 +03:00
|
|
|
{
|
|
|
|
static const char renamed_ref[] = "RENAMED-REF";
|
|
|
|
unsigned char sha1[20], orig_sha1[20];
|
|
|
|
int flag = 0, logmoved = 0;
|
|
|
|
struct ref_lock *lock;
|
|
|
|
struct stat loginfo;
|
2006-11-29 23:44:56 +03:00
|
|
|
int log = !lstat(git_path("logs/%s", oldref), &loginfo);
|
2008-10-26 05:33:56 +03:00
|
|
|
const char *symref = NULL;
|
2006-11-28 17:47:40 +03:00
|
|
|
|
2008-10-26 05:33:57 +03:00
|
|
|
if (log && S_ISLNK(loginfo.st_mode))
|
2006-11-28 17:47:40 +03:00
|
|
|
return error("reflog for %s is a symlink", oldref);
|
|
|
|
|
2008-10-26 05:33:56 +03:00
|
|
|
symref = resolve_ref(oldref, orig_sha1, 1, &flag);
|
|
|
|
if (flag & REF_ISSYMREF)
|
2008-10-29 03:05:27 +03:00
|
|
|
return error("refname %s is a symbolic ref, renaming it is not supported",
|
|
|
|
oldref);
|
2008-10-26 05:33:56 +03:00
|
|
|
if (!symref)
|
2006-11-28 17:47:40 +03:00
|
|
|
return error("refname %s not found", oldref);
|
|
|
|
|
|
|
|
if (!is_refname_available(newref, oldref, get_packed_refs(), 0))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
if (!is_refname_available(newref, oldref, get_loose_refs(), 0))
|
|
|
|
return 1;
|
|
|
|
|
2007-05-09 14:33:20 +04:00
|
|
|
lock = lock_ref_sha1_basic(renamed_ref, NULL, 0, NULL);
|
2006-11-28 17:47:40 +03:00
|
|
|
if (!lock)
|
|
|
|
return error("unable to lock %s", renamed_ref);
|
|
|
|
lock->force_write = 1;
|
2006-11-30 05:16:56 +03:00
|
|
|
if (write_ref_sha1(lock, orig_sha1, logmsg))
|
2006-11-28 17:47:40 +03:00
|
|
|
return error("unable to save current sha1 in %s", renamed_ref);
|
|
|
|
|
|
|
|
if (log && rename(git_path("logs/%s", oldref), git_path("tmp-renamed-log")))
|
|
|
|
return error("unable to move logfile logs/%s to tmp-renamed-log: %s",
|
|
|
|
oldref, strerror(errno));
|
|
|
|
|
2008-10-26 05:33:56 +03:00
|
|
|
if (delete_ref(oldref, orig_sha1, REF_NODEREF)) {
|
2006-11-28 17:47:40 +03:00
|
|
|
error("unable to delete old %s", oldref);
|
|
|
|
goto rollback;
|
|
|
|
}
|
|
|
|
|
2008-10-26 05:33:56 +03:00
|
|
|
if (resolve_ref(newref, sha1, 1, &flag) && delete_ref(newref, sha1, REF_NODEREF)) {
|
2006-11-28 17:47:40 +03:00
|
|
|
if (errno==EISDIR) {
|
|
|
|
if (remove_empty_directories(git_path("%s", newref))) {
|
|
|
|
error("Directory not empty: %s", newref);
|
|
|
|
goto rollback;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
error("unable to delete existing %s", newref);
|
|
|
|
goto rollback;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (log && safe_create_leading_directories(git_path("logs/%s", newref))) {
|
|
|
|
error("unable to create directory for %s", newref);
|
|
|
|
goto rollback;
|
|
|
|
}
|
|
|
|
|
|
|
|
retry:
|
|
|
|
if (log && rename(git_path("tmp-renamed-log"), git_path("logs/%s", newref))) {
|
2007-01-16 04:30:59 +03:00
|
|
|
if (errno==EISDIR || errno==ENOTDIR) {
|
|
|
|
/*
|
|
|
|
* rename(a, b) when b is an existing
|
|
|
|
* directory ought to result in ISDIR, but
|
|
|
|
* Solaris 5.8 gives ENOTDIR. Sheesh.
|
|
|
|
*/
|
2006-11-28 17:47:40 +03:00
|
|
|
if (remove_empty_directories(git_path("logs/%s", newref))) {
|
|
|
|
error("Directory not empty: logs/%s", newref);
|
|
|
|
goto rollback;
|
|
|
|
}
|
|
|
|
goto retry;
|
|
|
|
} else {
|
|
|
|
error("unable to move logfile tmp-renamed-log to logs/%s: %s",
|
|
|
|
newref, strerror(errno));
|
|
|
|
goto rollback;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
logmoved = log;
|
|
|
|
|
2007-05-09 14:33:20 +04:00
|
|
|
lock = lock_ref_sha1_basic(newref, NULL, 0, NULL);
|
2006-11-28 17:47:40 +03:00
|
|
|
if (!lock) {
|
|
|
|
error("unable to lock %s for update", newref);
|
|
|
|
goto rollback;
|
|
|
|
}
|
|
|
|
lock->force_write = 1;
|
|
|
|
hashcpy(lock->old_sha1, orig_sha1);
|
2006-11-30 05:16:56 +03:00
|
|
|
if (write_ref_sha1(lock, orig_sha1, logmsg)) {
|
2006-11-28 17:47:40 +03:00
|
|
|
error("unable to write current sha1 into %s", newref);
|
|
|
|
goto rollback;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
rollback:
|
2007-05-09 14:33:20 +04:00
|
|
|
lock = lock_ref_sha1_basic(oldref, NULL, 0, NULL);
|
2006-11-28 17:47:40 +03:00
|
|
|
if (!lock) {
|
|
|
|
error("unable to lock %s for rollback", oldref);
|
|
|
|
goto rollbacklog;
|
|
|
|
}
|
|
|
|
|
|
|
|
lock->force_write = 1;
|
|
|
|
flag = log_all_ref_updates;
|
|
|
|
log_all_ref_updates = 0;
|
|
|
|
if (write_ref_sha1(lock, orig_sha1, NULL))
|
|
|
|
error("unable to write current sha1 into %s", oldref);
|
|
|
|
log_all_ref_updates = flag;
|
|
|
|
|
|
|
|
rollbacklog:
|
|
|
|
if (logmoved && rename(git_path("logs/%s", newref), git_path("logs/%s", oldref)))
|
|
|
|
error("unable to restore logfile %s from %s: %s",
|
|
|
|
oldref, newref, strerror(errno));
|
|
|
|
if (!logmoved && log &&
|
|
|
|
rename(git_path("tmp-renamed-log"), git_path("logs/%s", oldref)))
|
|
|
|
error("unable to restore logfile %s from tmp-renamed-log: %s",
|
|
|
|
oldref, strerror(errno));
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2008-02-22 21:57:30 +03:00
|
|
|
int close_ref(struct ref_lock *lock)
|
2008-01-16 22:14:30 +03:00
|
|
|
{
|
|
|
|
if (close_lock_file(lock->lk))
|
|
|
|
return -1;
|
|
|
|
lock->lock_fd = -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-02-22 21:57:30 +03:00
|
|
|
int commit_ref(struct ref_lock *lock)
|
2008-01-16 22:14:30 +03:00
|
|
|
{
|
|
|
|
if (commit_lock_file(lock->lk))
|
|
|
|
return -1;
|
|
|
|
lock->lock_fd = -1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-06-07 01:04:17 +04:00
|
|
|
void unlock_ref(struct ref_lock *lock)
|
2006-05-17 13:55:02 +04:00
|
|
|
{
|
2008-01-16 22:12:46 +03:00
|
|
|
/* Do not free lock->lk -- atexit() still looks at them */
|
|
|
|
if (lock->lk)
|
|
|
|
rollback_lock_file(lock->lk);
|
Enable the packed refs file format
This actually "turns on" the packed ref file format, now that the
infrastructure to do so sanely exists (ie notably the change to make the
reference reading logic take refnames rather than pathnames to the loose
objects that no longer necessarily even exist).
In particular, when the ref lookup hits a refname that has no loose file
associated with it, it falls back on the packed-ref information. Also, the
ref-locking code, while still using a loose file for the locking itself
(and _creating_ a loose file for the new ref) no longer requires that the
old ref be in such an unpacked state.
Finally, this does a minimal hack to git-checkout.sh to rather than check
the ref-file directly, do a "git-rev-parse" on the "heads/$refname".
That's not really wonderful - we should rather really have a special
routine to verify the names as proper branch head names, but it is a
workable solution for now.
With this, I can literally do something like
git pack-refs
find .git/refs -type f -print0 | xargs -0 rm -f --
and the end result is a largely working repository (ie I've done two
commits - which creates _one_ unpacked ref file - done things like run
"gitk" and "git log" etc, and it all looks ok).
There are probably things missing, but I'm hoping that the missing things
are now of the "small and obvious" kind, and that somebody else might want
to start looking at this too. Hint hint ;)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-14 21:14:47 +04:00
|
|
|
free(lock->ref_name);
|
2007-01-27 01:26:06 +03:00
|
|
|
free(lock->orig_ref_name);
|
2006-05-17 13:55:02 +04:00
|
|
|
free(lock);
|
|
|
|
}
|
|
|
|
|
2007-07-29 04:17:17 +04:00
|
|
|
/*
|
|
|
|
* copy the reflog message msg to buf, which has been allocated sufficiently
|
|
|
|
* large, while cleaning up the whitespaces. Especially, convert LF to space,
|
|
|
|
* because reflog file is one line per entry.
|
|
|
|
*/
|
|
|
|
static int copy_msg(char *buf, const char *msg)
|
|
|
|
{
|
|
|
|
char *cp = buf;
|
|
|
|
char c;
|
|
|
|
int wasspace = 1;
|
|
|
|
|
|
|
|
*cp++ = '\t';
|
|
|
|
while ((c = *msg++)) {
|
|
|
|
if (wasspace && isspace(c))
|
|
|
|
continue;
|
|
|
|
wasspace = isspace(c);
|
|
|
|
if (wasspace)
|
|
|
|
c = ' ';
|
|
|
|
*cp++ = c;
|
|
|
|
}
|
|
|
|
while (buf < cp && isspace(cp[-1]))
|
|
|
|
cp--;
|
|
|
|
*cp++ = '\n';
|
|
|
|
return cp - buf;
|
|
|
|
}
|
|
|
|
|
2007-01-27 01:26:05 +03:00
|
|
|
static int log_ref_write(const char *ref_name, const unsigned char *old_sha1,
|
|
|
|
const unsigned char *new_sha1, const char *msg)
|
2006-05-17 13:55:40 +04:00
|
|
|
{
|
|
|
|
int logfd, written, oflags = O_APPEND | O_WRONLY;
|
|
|
|
unsigned maxlen, len;
|
2007-01-26 13:26:04 +03:00
|
|
|
int msglen;
|
2008-10-27 13:11:40 +03:00
|
|
|
char log_file[PATH_MAX];
|
|
|
|
char *logrec;
|
2006-07-09 13:36:24 +04:00
|
|
|
const char *committer;
|
2006-05-17 13:55:40 +04:00
|
|
|
|
Move initialization of log_all_ref_updates
The patches to prevent Porcelainish that require working tree
from doing any damage in a bare repository make a lot of sense,
and I want to make the is_bare_git_dir() function more reliable.
In order to allow the repository owner override the heuristic
implemented in is_bare_git_dir() if/when it misidentifies a
particular repository, it would make sense to introduce a new
configuration variable "[core] bare = true/false", and make
is_bare_git_dir() notice it.
The scripts would do a 'repo-config --bool --get core.bare' and
iff the command fails (i.e. there is no such variable in the
configuration file), it would use the heuristic implemented at
the script level [*1*].
However, setup_git_env() which is called a lot earlier than we
even read from the repository configuration currently makes a
call to is_bare_git_dir(), in order to change the default
setting for log_all_ref_updates. It somehow feels that this is
a hack.
By the way, [*1*] is another thing I hate about the current
config mechanism. "git-repo-config --get" does not know what
the possible configuration variables are, let alone what the
default values for them are. It allows us not to maintain a
centralized configuration table, which makes it easy to
introduce ad-hoc variables and gives a warm fuzzy feeling of
being modular, but my feeling is that it is turning out to be a
rather high price to pay for scripts.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-07 12:35:34 +03:00
|
|
|
if (log_all_ref_updates < 0)
|
2007-01-07 13:00:28 +03:00
|
|
|
log_all_ref_updates = !is_bare_repository();
|
Move initialization of log_all_ref_updates
The patches to prevent Porcelainish that require working tree
from doing any damage in a bare repository make a lot of sense,
and I want to make the is_bare_git_dir() function more reliable.
In order to allow the repository owner override the heuristic
implemented in is_bare_git_dir() if/when it misidentifies a
particular repository, it would make sense to introduce a new
configuration variable "[core] bare = true/false", and make
is_bare_git_dir() notice it.
The scripts would do a 'repo-config --bool --get core.bare' and
iff the command fails (i.e. there is no such variable in the
configuration file), it would use the heuristic implemented at
the script level [*1*].
However, setup_git_env() which is called a lot earlier than we
even read from the repository configuration currently makes a
call to is_bare_git_dir(), in order to change the default
setting for log_all_ref_updates. It somehow feels that this is
a hack.
By the way, [*1*] is another thing I hate about the current
config mechanism. "git-repo-config --get" does not know what
the possible configuration variables are, let alone what the
default values for them are. It allows us not to maintain a
centralized configuration table, which makes it easy to
introduce ad-hoc variables and gives a warm fuzzy feeling of
being modular, but my feeling is that it is turning out to be a
rather high price to pay for scripts.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-07 12:35:34 +03:00
|
|
|
|
2008-10-27 13:11:40 +03:00
|
|
|
git_snpath(log_file, sizeof(log_file), "logs/%s", ref_name);
|
2007-01-27 01:26:05 +03:00
|
|
|
|
2006-10-08 12:35:18 +04:00
|
|
|
if (log_all_ref_updates &&
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 12:53:29 +03:00
|
|
|
(!prefixcmp(ref_name, "refs/heads/") ||
|
|
|
|
!prefixcmp(ref_name, "refs/remotes/") ||
|
2007-01-27 01:26:07 +03:00
|
|
|
!strcmp(ref_name, "HEAD"))) {
|
2007-01-27 01:26:05 +03:00
|
|
|
if (safe_create_leading_directories(log_file) < 0)
|
2006-05-17 13:55:40 +04:00
|
|
|
return error("unable to create directory for %s",
|
2007-01-27 01:26:05 +03:00
|
|
|
log_file);
|
2006-05-17 13:55:40 +04:00
|
|
|
oflags |= O_CREAT;
|
|
|
|
}
|
|
|
|
|
2007-01-27 01:26:05 +03:00
|
|
|
logfd = open(log_file, oflags, 0666);
|
2006-05-17 13:55:40 +04:00
|
|
|
if (logfd < 0) {
|
2006-10-10 08:15:59 +04:00
|
|
|
if (!(oflags & O_CREAT) && errno == ENOENT)
|
2006-05-17 13:55:40 +04:00
|
|
|
return 0;
|
2006-10-19 12:28:47 +04:00
|
|
|
|
|
|
|
if ((oflags & O_CREAT) && errno == EISDIR) {
|
2007-01-27 01:26:05 +03:00
|
|
|
if (remove_empty_directories(log_file)) {
|
2006-10-19 12:28:47 +04:00
|
|
|
return error("There are still logs under '%s'",
|
2007-01-27 01:26:05 +03:00
|
|
|
log_file);
|
2006-10-19 12:28:47 +04:00
|
|
|
}
|
2007-01-27 01:26:05 +03:00
|
|
|
logfd = open(log_file, oflags, 0666);
|
2006-10-19 12:28:47 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (logfd < 0)
|
|
|
|
return error("Unable to append to %s: %s",
|
2007-01-27 01:26:05 +03:00
|
|
|
log_file, strerror(errno));
|
2006-05-17 13:55:40 +04:00
|
|
|
}
|
|
|
|
|
2007-03-10 01:38:57 +03:00
|
|
|
adjust_shared_perm(log_file);
|
|
|
|
|
2007-07-29 04:17:17 +04:00
|
|
|
msglen = msg ? strlen(msg) : 0;
|
2007-12-09 04:32:08 +03:00
|
|
|
committer = git_committer_info(0);
|
2007-01-26 13:26:04 +03:00
|
|
|
maxlen = strlen(committer) + msglen + 100;
|
|
|
|
logrec = xmalloc(maxlen);
|
|
|
|
len = sprintf(logrec, "%s %s %s\n",
|
2007-01-27 01:26:05 +03:00
|
|
|
sha1_to_hex(old_sha1),
|
|
|
|
sha1_to_hex(new_sha1),
|
2007-01-26 13:26:04 +03:00
|
|
|
committer);
|
|
|
|
if (msglen)
|
2007-07-29 04:17:17 +04:00
|
|
|
len += copy_msg(logrec + len - 1, msg) - 1;
|
2007-01-08 18:58:23 +03:00
|
|
|
written = len <= maxlen ? write_in_full(logfd, logrec, len) : -1;
|
2006-05-17 13:55:40 +04:00
|
|
|
free(logrec);
|
2007-06-24 23:20:41 +04:00
|
|
|
if (close(logfd) != 0 || written != len)
|
2007-01-27 01:26:05 +03:00
|
|
|
return error("Unable to append to %s", log_file);
|
2006-05-17 13:55:40 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-01-16 02:50:17 +03:00
|
|
|
static int is_branch(const char *refname)
|
|
|
|
{
|
|
|
|
return !strcmp(refname, "HEAD") || !prefixcmp(refname, "refs/heads/");
|
|
|
|
}
|
|
|
|
|
2006-05-17 13:55:02 +04:00
|
|
|
int write_ref_sha1(struct ref_lock *lock,
|
|
|
|
const unsigned char *sha1, const char *logmsg)
|
|
|
|
{
|
|
|
|
static char term = '\n';
|
2008-01-16 02:50:17 +03:00
|
|
|
struct object *o;
|
2006-05-17 13:55:02 +04:00
|
|
|
|
|
|
|
if (!lock)
|
2005-06-07 00:31:29 +04:00
|
|
|
return -1;
|
2006-08-17 22:54:57 +04:00
|
|
|
if (!lock->force_write && !hashcmp(lock->old_sha1, sha1)) {
|
2006-05-17 13:55:02 +04:00
|
|
|
unlock_ref(lock);
|
|
|
|
return 0;
|
2005-06-07 00:31:29 +04:00
|
|
|
}
|
2008-01-16 02:50:17 +03:00
|
|
|
o = parse_object(sha1);
|
|
|
|
if (!o) {
|
|
|
|
error("Trying to write ref %s with nonexistant object %s",
|
|
|
|
lock->ref_name, sha1_to_hex(sha1));
|
|
|
|
unlock_ref(lock);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (o->type != OBJ_COMMIT && is_branch(lock->ref_name)) {
|
|
|
|
error("Trying to write non-commit object %s to branch %s",
|
|
|
|
sha1_to_hex(sha1), lock->ref_name);
|
|
|
|
unlock_ref(lock);
|
|
|
|
return -1;
|
|
|
|
}
|
2007-01-08 18:58:23 +03:00
|
|
|
if (write_in_full(lock->lock_fd, sha1_to_hex(sha1), 40) != 40 ||
|
|
|
|
write_in_full(lock->lock_fd, &term, 1) != 1
|
2008-01-16 22:14:30 +03:00
|
|
|
|| close_ref(lock) < 0) {
|
2006-06-07 00:54:14 +04:00
|
|
|
error("Couldn't write %s", lock->lk->filename);
|
2006-05-17 13:55:02 +04:00
|
|
|
unlock_ref(lock);
|
|
|
|
return -1;
|
|
|
|
}
|
2006-09-30 23:37:37 +04:00
|
|
|
invalidate_cached_refs();
|
2007-01-27 01:26:07 +03:00
|
|
|
if (log_ref_write(lock->ref_name, lock->old_sha1, sha1, logmsg) < 0 ||
|
|
|
|
(strcmp(lock->ref_name, lock->orig_ref_name) &&
|
|
|
|
log_ref_write(lock->orig_ref_name, lock->old_sha1, sha1, logmsg) < 0)) {
|
2006-05-17 13:55:40 +04:00
|
|
|
unlock_ref(lock);
|
|
|
|
return -1;
|
|
|
|
}
|
2007-03-22 00:11:44 +03:00
|
|
|
if (strcmp(lock->orig_ref_name, "HEAD") != 0) {
|
|
|
|
/*
|
|
|
|
* Special hack: If a branch is updated directly and HEAD
|
|
|
|
* points to it (may happen on the remote side of a push
|
|
|
|
* for example) then logically the HEAD reflog should be
|
|
|
|
* updated too.
|
|
|
|
* A generic solution implies reverse symref information,
|
|
|
|
* but finding all symrefs pointing to the given branch
|
|
|
|
* would be rather costly for this rare event (the direct
|
|
|
|
* update of a branch) to be worth it. So let's cheat and
|
|
|
|
* check with HEAD only which should cover 99% of all usage
|
|
|
|
* scenarios (even 100% of the default ones).
|
|
|
|
*/
|
|
|
|
unsigned char head_sha1[20];
|
|
|
|
int head_flag;
|
|
|
|
const char *head_ref;
|
|
|
|
head_ref = resolve_ref("HEAD", head_sha1, 1, &head_flag);
|
|
|
|
if (head_ref && (head_flag & REF_ISSYMREF) &&
|
|
|
|
!strcmp(head_ref, lock->ref_name))
|
|
|
|
log_ref_write("HEAD", lock->old_sha1, sha1, logmsg);
|
|
|
|
}
|
2008-01-16 22:14:30 +03:00
|
|
|
if (commit_ref(lock)) {
|
Enable the packed refs file format
This actually "turns on" the packed ref file format, now that the
infrastructure to do so sanely exists (ie notably the change to make the
reference reading logic take refnames rather than pathnames to the loose
objects that no longer necessarily even exist).
In particular, when the ref lookup hits a refname that has no loose file
associated with it, it falls back on the packed-ref information. Also, the
ref-locking code, while still using a loose file for the locking itself
(and _creating_ a loose file for the new ref) no longer requires that the
old ref be in such an unpacked state.
Finally, this does a minimal hack to git-checkout.sh to rather than check
the ref-file directly, do a "git-rev-parse" on the "heads/$refname".
That's not really wonderful - we should rather really have a special
routine to verify the names as proper branch head names, but it is a
workable solution for now.
With this, I can literally do something like
git pack-refs
find .git/refs -type f -print0 | xargs -0 rm -f --
and the end result is a largely working repository (ie I've done two
commits - which creates _one_ unpacked ref file - done things like run
"gitk" and "git log" etc, and it all looks ok).
There are probably things missing, but I'm hoping that the missing things
are now of the "small and obvious" kind, and that somebody else might want
to start looking at this too. Hint hint ;)
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-09-14 21:14:47 +04:00
|
|
|
error("Couldn't set %s", lock->ref_name);
|
2006-05-17 13:55:02 +04:00
|
|
|
unlock_ref(lock);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
unlock_ref(lock);
|
|
|
|
return 0;
|
2005-06-07 00:31:29 +04:00
|
|
|
}
|
2006-05-17 13:56:09 +04:00
|
|
|
|
2007-01-27 01:26:10 +03:00
|
|
|
int create_symref(const char *ref_target, const char *refs_heads_master,
|
|
|
|
const char *logmsg)
|
2007-01-27 01:26:09 +03:00
|
|
|
{
|
|
|
|
const char *lockpath;
|
|
|
|
char ref[1000];
|
|
|
|
int fd, len, written;
|
2008-10-27 13:22:09 +03:00
|
|
|
char *git_HEAD = git_pathdup("%s", ref_target);
|
2007-01-27 01:26:10 +03:00
|
|
|
unsigned char old_sha1[20], new_sha1[20];
|
|
|
|
|
|
|
|
if (logmsg && read_ref(ref_target, old_sha1))
|
|
|
|
hashclr(old_sha1);
|
2007-01-27 01:26:09 +03:00
|
|
|
|
2007-02-08 10:41:43 +03:00
|
|
|
if (safe_create_leading_directories(git_HEAD) < 0)
|
|
|
|
return error("unable to create directory for %s", git_HEAD);
|
|
|
|
|
2007-01-27 01:26:09 +03:00
|
|
|
#ifndef NO_SYMLINK_HEAD
|
|
|
|
if (prefer_symlink_refs) {
|
|
|
|
unlink(git_HEAD);
|
|
|
|
if (!symlink(refs_heads_master, git_HEAD))
|
2007-01-27 01:26:10 +03:00
|
|
|
goto done;
|
2007-01-27 01:26:09 +03:00
|
|
|
fprintf(stderr, "no symlink - falling back to symbolic ref\n");
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
len = snprintf(ref, sizeof(ref), "ref: %s\n", refs_heads_master);
|
|
|
|
if (sizeof(ref) <= len) {
|
|
|
|
error("refname too long: %s", refs_heads_master);
|
2007-01-27 04:49:00 +03:00
|
|
|
goto error_free_return;
|
2007-01-27 01:26:09 +03:00
|
|
|
}
|
|
|
|
lockpath = mkpath("%s.lock", git_HEAD);
|
|
|
|
fd = open(lockpath, O_CREAT | O_EXCL | O_WRONLY, 0666);
|
|
|
|
if (fd < 0) {
|
|
|
|
error("Unable to open %s for writing", lockpath);
|
2007-01-27 04:49:00 +03:00
|
|
|
goto error_free_return;
|
2007-01-27 01:26:09 +03:00
|
|
|
}
|
|
|
|
written = write_in_full(fd, ref, len);
|
2007-06-24 23:20:41 +04:00
|
|
|
if (close(fd) != 0 || written != len) {
|
2007-01-27 01:26:09 +03:00
|
|
|
error("Unable to write to %s", lockpath);
|
2007-01-27 04:49:00 +03:00
|
|
|
goto error_unlink_return;
|
2007-01-27 01:26:09 +03:00
|
|
|
}
|
|
|
|
if (rename(lockpath, git_HEAD) < 0) {
|
|
|
|
error("Unable to create %s", git_HEAD);
|
2007-01-27 04:49:00 +03:00
|
|
|
goto error_unlink_return;
|
2007-01-27 01:26:09 +03:00
|
|
|
}
|
|
|
|
if (adjust_shared_perm(git_HEAD)) {
|
|
|
|
error("Unable to fix permissions on %s", lockpath);
|
2007-01-27 04:49:00 +03:00
|
|
|
error_unlink_return:
|
2009-04-30 01:22:56 +04:00
|
|
|
unlink_or_warn(lockpath);
|
2007-01-27 04:49:00 +03:00
|
|
|
error_free_return:
|
|
|
|
free(git_HEAD);
|
|
|
|
return -1;
|
2007-01-27 01:26:09 +03:00
|
|
|
}
|
2007-01-27 01:26:10 +03:00
|
|
|
|
2007-03-03 21:28:46 +03:00
|
|
|
#ifndef NO_SYMLINK_HEAD
|
2007-01-27 01:26:10 +03:00
|
|
|
done:
|
2007-03-03 21:28:46 +03:00
|
|
|
#endif
|
2007-01-27 01:26:10 +03:00
|
|
|
if (logmsg && !read_ref(refs_heads_master, new_sha1))
|
|
|
|
log_ref_write(ref_target, old_sha1, new_sha1, logmsg);
|
|
|
|
|
2007-01-27 04:49:00 +03:00
|
|
|
free(git_HEAD);
|
2007-01-27 01:26:09 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-01-19 12:19:05 +03:00
|
|
|
static char *ref_msg(const char *line, const char *endp)
|
|
|
|
{
|
|
|
|
const char *ep;
|
|
|
|
line += 82;
|
2007-09-16 02:32:36 +04:00
|
|
|
ep = memchr(line, '\n', endp - line);
|
|
|
|
if (!ep)
|
|
|
|
ep = endp;
|
|
|
|
return xmemdupz(line, ep - line);
|
2007-01-19 12:19:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
int read_ref_at(const char *ref, unsigned long at_time, int cnt, unsigned char *sha1, char **msg, unsigned long *cutoff_time, int *cutoff_tz, int *cutoff_cnt)
|
2006-05-17 13:56:09 +04:00
|
|
|
{
|
2006-05-19 11:28:19 +04:00
|
|
|
const char *logfile, *logdata, *logend, *rec, *lastgt, *lastrec;
|
2006-05-17 13:56:09 +04:00
|
|
|
char *tz_c;
|
2006-12-19 09:07:45 +03:00
|
|
|
int logfd, tz, reccnt = 0;
|
2006-05-17 13:56:09 +04:00
|
|
|
struct stat st;
|
|
|
|
unsigned long date;
|
2006-05-19 11:28:19 +04:00
|
|
|
unsigned char logged_sha1[20];
|
2007-01-19 11:39:32 +03:00
|
|
|
void *log_mapped;
|
2007-03-07 04:44:37 +03:00
|
|
|
size_t mapsz;
|
2006-05-17 13:56:09 +04:00
|
|
|
|
|
|
|
logfile = git_path("logs/%s", ref);
|
|
|
|
logfd = open(logfile, O_RDONLY, 0);
|
|
|
|
if (logfd < 0)
|
2009-06-27 19:58:46 +04:00
|
|
|
die_errno("Unable to read log '%s'", logfile);
|
2006-05-17 13:56:09 +04:00
|
|
|
fstat(logfd, &st);
|
|
|
|
if (!st.st_size)
|
|
|
|
die("Log %s is empty.", logfile);
|
2007-03-07 04:44:37 +03:00
|
|
|
mapsz = xsize_t(st.st_size);
|
|
|
|
log_mapped = xmmap(NULL, mapsz, PROT_READ, MAP_PRIVATE, logfd, 0);
|
2007-01-19 11:39:32 +03:00
|
|
|
logdata = log_mapped;
|
2006-05-17 13:56:09 +04:00
|
|
|
close(logfd);
|
|
|
|
|
2006-05-19 11:28:19 +04:00
|
|
|
lastrec = NULL;
|
2006-05-17 13:56:09 +04:00
|
|
|
rec = logend = logdata + st.st_size;
|
|
|
|
while (logdata < rec) {
|
2006-12-19 09:07:45 +03:00
|
|
|
reccnt++;
|
2006-05-17 13:56:09 +04:00
|
|
|
if (logdata < rec && *(rec-1) == '\n')
|
|
|
|
rec--;
|
2006-05-19 11:28:19 +04:00
|
|
|
lastgt = NULL;
|
|
|
|
while (logdata < rec && *(rec-1) != '\n') {
|
2006-05-17 13:56:09 +04:00
|
|
|
rec--;
|
2006-05-19 11:28:19 +04:00
|
|
|
if (*rec == '>')
|
|
|
|
lastgt = rec;
|
|
|
|
}
|
|
|
|
if (!lastgt)
|
2006-05-17 13:56:09 +04:00
|
|
|
die("Log %s is corrupt.", logfile);
|
2006-05-19 11:28:19 +04:00
|
|
|
date = strtoul(lastgt + 1, &tz_c, 10);
|
2006-10-06 10:16:15 +04:00
|
|
|
if (date <= at_time || cnt == 0) {
|
show-branch --reflog: show the reflog message at the top.
This changes the output so the list at the top shows the reflog
message, along with their relative timestamps.
You can use --reflog=<n> to show <n> most recent log entries, or
use --reflog=<n>,<b> to show <n> entries going back from the
entry <b>. <b> can be either a number (so --reflog=4,20 shows 4
records starting from @{20}) or a timestamp (e.g. --reflog='4,1 day').
Here is a sample output (with --list option):
$ git show-branch --reflog=10 --list jc/show-reflog
[jc/show-reflog@{0}] (3 minutes ago) commit (amend): show-branch --ref
[jc/show-reflog@{1}] (5 minutes ago) reset HEAD^
[jc/show-reflog@{2}] (14 minutes ago) commit: show-branch --reflog: sho
[jc/show-reflog@{3}] (14 minutes ago) commit: show-branch --reflog: sho
[jc/show-reflog@{4}] (18 minutes ago) commit (amend): Extend read_ref_a
[jc/show-reflog@{5}] (18 minutes ago) commit (amend): Extend read_ref_a
[jc/show-reflog@{6}] (18 minutes ago) commit (amend): Extend read_ref_a
[jc/show-reflog@{7}] (18 minutes ago) am: read_ref_at(): allow retrievi
[jc/show-reflog@{8}] (18 minutes ago) reset --hard HEAD~4
[jc/show-reflog@{9}] (61 minutes ago) commit: show-branch --reflog: use
This shows what I did more cleanly:
$ git show-branch --reflog=10 jc/show-reflog
! [jc/show-reflog@{0}] (3 minutes ago) commit (amend): show-branch --ref
! [jc/show-reflog@{1}] (5 minutes ago) reset HEAD^
! [jc/show-reflog@{2}] (14 minutes ago) commit: show-branch --reflog:
! [jc/show-reflog@{3}] (14 minutes ago) commit: show-branch --reflog:
! [jc/show-reflog@{4}] (18 minutes ago) commit (amend): Extend read_
! [jc/show-reflog@{5}] (18 minutes ago) commit (amend): Extend read
! [jc/show-reflog@{6}] (18 minutes ago) commit (amend): Extend rea
! [jc/show-reflog@{7}] (18 minutes ago) am: read_ref_at(): allow
! [jc/show-reflog@{8}] (18 minutes ago) reset --hard HEAD~4
! [jc/show-reflog@{9}] (61 minutes ago) commit: show-branch --r
----------
+ [jc/show-reflog@{0}] show-branch --reflog: show the reflog
+ [jc/show-reflog@{2}] show-branch --reflog: show the reflog
+++ [jc/show-reflog@{1}] show-branch --reflog: show the reflog
+++++ [jc/show-reflog@{4}] Extend read_ref_at() to be usable fro
+ [jc/show-reflog@{5}] Extend read_ref_at() to be usable fro
+ [jc/show-reflog@{6}] Extend read_ref_at() to be usable fro
+ [jc/show-reflog@{7}] read_ref_at(): allow retrieving the r
+ [jc/show-reflog@{9}] show-branch --reflog: use updated rea
+ [jc/show-reflog@{9}^] read_ref_at(): allow reporting the c
+ [jc/show-reflog@{9}~2] show-branch --reflog: show the refl
+ [jc/show-reflog@{9}~3] read_ref_at(): allow retrieving the
++++++++++ [jc/show-reflog@{8}] dwim_ref(): Separate name-to-ref DWIM
At @{9}, I had a commit to complete 5 patch series, but I wanted
to consolidate two commits that enhances read_ref_at() into one
(they were @{9}^ and @{9}~3), and another two that touch show-branch
into one (@{9} and @{9}~2).
I first saved them with "format-patch -4", and then did a reset
at @{8}. At @{7}, I applied one of them with "am", and then
used "git-apply" on the other one, and amended the commit at
@{6} (so @{6} and @{7} has the same parent). I did not like the
log message, so I amended again at @{5}.
Then I cherry-picked @{9}~2 to create @{3} (the log message
shows that it needs to learn to set GIT_REFLOG_ACTION -- it uses
"git-commit" and the log entry is attributed for it). Another
cherry-pick built @{2} out of @{9}, but what I wanted to do was
to squash these two into one, so I did a "reset HEAD^" at @{1}
and then made the final commit by amending what was at the top.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-19 12:20:23 +03:00
|
|
|
tz = strtoul(tz_c, NULL, 10);
|
2007-01-19 12:19:05 +03:00
|
|
|
if (msg)
|
|
|
|
*msg = ref_msg(rec, logend);
|
|
|
|
if (cutoff_time)
|
|
|
|
*cutoff_time = date;
|
|
|
|
if (cutoff_tz)
|
|
|
|
*cutoff_tz = tz;
|
|
|
|
if (cutoff_cnt)
|
show-branch --reflog: show the reflog message at the top.
This changes the output so the list at the top shows the reflog
message, along with their relative timestamps.
You can use --reflog=<n> to show <n> most recent log entries, or
use --reflog=<n>,<b> to show <n> entries going back from the
entry <b>. <b> can be either a number (so --reflog=4,20 shows 4
records starting from @{20}) or a timestamp (e.g. --reflog='4,1 day').
Here is a sample output (with --list option):
$ git show-branch --reflog=10 --list jc/show-reflog
[jc/show-reflog@{0}] (3 minutes ago) commit (amend): show-branch --ref
[jc/show-reflog@{1}] (5 minutes ago) reset HEAD^
[jc/show-reflog@{2}] (14 minutes ago) commit: show-branch --reflog: sho
[jc/show-reflog@{3}] (14 minutes ago) commit: show-branch --reflog: sho
[jc/show-reflog@{4}] (18 minutes ago) commit (amend): Extend read_ref_a
[jc/show-reflog@{5}] (18 minutes ago) commit (amend): Extend read_ref_a
[jc/show-reflog@{6}] (18 minutes ago) commit (amend): Extend read_ref_a
[jc/show-reflog@{7}] (18 minutes ago) am: read_ref_at(): allow retrievi
[jc/show-reflog@{8}] (18 minutes ago) reset --hard HEAD~4
[jc/show-reflog@{9}] (61 minutes ago) commit: show-branch --reflog: use
This shows what I did more cleanly:
$ git show-branch --reflog=10 jc/show-reflog
! [jc/show-reflog@{0}] (3 minutes ago) commit (amend): show-branch --ref
! [jc/show-reflog@{1}] (5 minutes ago) reset HEAD^
! [jc/show-reflog@{2}] (14 minutes ago) commit: show-branch --reflog:
! [jc/show-reflog@{3}] (14 minutes ago) commit: show-branch --reflog:
! [jc/show-reflog@{4}] (18 minutes ago) commit (amend): Extend read_
! [jc/show-reflog@{5}] (18 minutes ago) commit (amend): Extend read
! [jc/show-reflog@{6}] (18 minutes ago) commit (amend): Extend rea
! [jc/show-reflog@{7}] (18 minutes ago) am: read_ref_at(): allow
! [jc/show-reflog@{8}] (18 minutes ago) reset --hard HEAD~4
! [jc/show-reflog@{9}] (61 minutes ago) commit: show-branch --r
----------
+ [jc/show-reflog@{0}] show-branch --reflog: show the reflog
+ [jc/show-reflog@{2}] show-branch --reflog: show the reflog
+++ [jc/show-reflog@{1}] show-branch --reflog: show the reflog
+++++ [jc/show-reflog@{4}] Extend read_ref_at() to be usable fro
+ [jc/show-reflog@{5}] Extend read_ref_at() to be usable fro
+ [jc/show-reflog@{6}] Extend read_ref_at() to be usable fro
+ [jc/show-reflog@{7}] read_ref_at(): allow retrieving the r
+ [jc/show-reflog@{9}] show-branch --reflog: use updated rea
+ [jc/show-reflog@{9}^] read_ref_at(): allow reporting the c
+ [jc/show-reflog@{9}~2] show-branch --reflog: show the refl
+ [jc/show-reflog@{9}~3] read_ref_at(): allow retrieving the
++++++++++ [jc/show-reflog@{8}] dwim_ref(): Separate name-to-ref DWIM
At @{9}, I had a commit to complete 5 patch series, but I wanted
to consolidate two commits that enhances read_ref_at() into one
(they were @{9}^ and @{9}~3), and another two that touch show-branch
into one (@{9} and @{9}~2).
I first saved them with "format-patch -4", and then did a reset
at @{8}. At @{7}, I applied one of them with "am", and then
used "git-apply" on the other one, and amended the commit at
@{6} (so @{6} and @{7} has the same parent). I did not like the
log message, so I amended again at @{5}.
Then I cherry-picked @{9}~2 to create @{3} (the log message
shows that it needs to learn to set GIT_REFLOG_ACTION -- it uses
"git-commit" and the log entry is attributed for it). Another
cherry-pick built @{2} out of @{9}, but what I wanted to do was
to squash these two into one, so I did a "reset HEAD^" at @{1}
and then made the final commit by amending what was at the top.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-01-19 12:20:23 +03:00
|
|
|
*cutoff_cnt = reccnt - 1;
|
2006-05-19 11:28:19 +04:00
|
|
|
if (lastrec) {
|
|
|
|
if (get_sha1_hex(lastrec, logged_sha1))
|
|
|
|
die("Log %s is corrupt.", logfile);
|
|
|
|
if (get_sha1_hex(rec + 41, sha1))
|
|
|
|
die("Log %s is corrupt.", logfile);
|
2006-08-17 22:54:57 +04:00
|
|
|
if (hashcmp(logged_sha1, sha1)) {
|
2009-03-24 04:09:17 +03:00
|
|
|
warning("Log %s has gap after %s.",
|
2007-07-14 10:14:52 +04:00
|
|
|
logfile, show_date(date, tz, DATE_RFC2822));
|
2006-05-19 11:28:19 +04:00
|
|
|
}
|
2006-06-07 01:04:17 +04:00
|
|
|
}
|
|
|
|
else if (date == at_time) {
|
2006-05-19 11:28:19 +04:00
|
|
|
if (get_sha1_hex(rec + 41, sha1))
|
|
|
|
die("Log %s is corrupt.", logfile);
|
2006-06-07 01:04:17 +04:00
|
|
|
}
|
|
|
|
else {
|
2006-05-19 11:28:19 +04:00
|
|
|
if (get_sha1_hex(rec + 41, logged_sha1))
|
|
|
|
die("Log %s is corrupt.", logfile);
|
2006-08-17 22:54:57 +04:00
|
|
|
if (hashcmp(logged_sha1, sha1)) {
|
2009-03-24 04:09:17 +03:00
|
|
|
warning("Log %s unexpectedly ended on %s.",
|
2007-07-14 10:14:52 +04:00
|
|
|
logfile, show_date(date, tz, DATE_RFC2822));
|
2006-05-19 11:28:19 +04:00
|
|
|
}
|
|
|
|
}
|
2007-03-07 04:44:37 +03:00
|
|
|
munmap(log_mapped, mapsz);
|
2006-05-17 13:56:09 +04:00
|
|
|
return 0;
|
|
|
|
}
|
2006-05-19 11:28:19 +04:00
|
|
|
lastrec = rec;
|
2006-10-06 10:16:15 +04:00
|
|
|
if (cnt > 0)
|
|
|
|
cnt--;
|
2006-05-17 13:56:09 +04:00
|
|
|
}
|
|
|
|
|
2006-05-19 11:28:19 +04:00
|
|
|
rec = logdata;
|
|
|
|
while (rec < logend && *rec != '>' && *rec != '\n')
|
|
|
|
rec++;
|
|
|
|
if (rec == logend || *rec == '\n')
|
2006-05-17 13:56:09 +04:00
|
|
|
die("Log %s is corrupt.", logfile);
|
2006-05-19 11:28:19 +04:00
|
|
|
date = strtoul(rec + 1, &tz_c, 10);
|
2006-05-17 13:56:09 +04:00
|
|
|
tz = strtoul(tz_c, NULL, 10);
|
|
|
|
if (get_sha1_hex(logdata, sha1))
|
|
|
|
die("Log %s is corrupt.", logfile);
|
2008-07-08 08:38:54 +04:00
|
|
|
if (is_null_sha1(sha1)) {
|
|
|
|
if (get_sha1_hex(logdata + 41, sha1))
|
|
|
|
die("Log %s is corrupt.", logfile);
|
|
|
|
}
|
2007-01-19 12:19:05 +03:00
|
|
|
if (msg)
|
|
|
|
*msg = ref_msg(logdata, logend);
|
2007-03-07 04:44:37 +03:00
|
|
|
munmap(log_mapped, mapsz);
|
2007-01-19 12:19:05 +03:00
|
|
|
|
|
|
|
if (cutoff_time)
|
|
|
|
*cutoff_time = date;
|
|
|
|
if (cutoff_tz)
|
|
|
|
*cutoff_tz = tz;
|
|
|
|
if (cutoff_cnt)
|
|
|
|
*cutoff_cnt = reccnt;
|
|
|
|
return 1;
|
2006-05-17 13:56:09 +04:00
|
|
|
}
|
2006-12-18 12:18:16 +03:00
|
|
|
|
2009-01-20 09:18:29 +03:00
|
|
|
int for_each_recent_reflog_ent(const char *ref, each_reflog_ent_fn fn, long ofs, void *cb_data)
|
2006-12-18 12:18:16 +03:00
|
|
|
{
|
|
|
|
const char *logfile;
|
|
|
|
FILE *logfp;
|
2010-03-13 20:37:50 +03:00
|
|
|
struct strbuf sb = STRBUF_INIT;
|
2007-01-19 10:25:54 +03:00
|
|
|
int ret = 0;
|
2006-12-18 12:18:16 +03:00
|
|
|
|
|
|
|
logfile = git_path("logs/%s", ref);
|
|
|
|
logfp = fopen(logfile, "r");
|
|
|
|
if (!logfp)
|
2007-01-08 03:59:54 +03:00
|
|
|
return -1;
|
2009-01-20 09:18:29 +03:00
|
|
|
|
|
|
|
if (ofs) {
|
|
|
|
struct stat statbuf;
|
|
|
|
if (fstat(fileno(logfp), &statbuf) ||
|
|
|
|
statbuf.st_size < ofs ||
|
|
|
|
fseek(logfp, -ofs, SEEK_END) ||
|
2010-03-13 20:37:50 +03:00
|
|
|
strbuf_getwholeline(&sb, logfp, '\n')) {
|
2009-07-17 01:25:18 +04:00
|
|
|
fclose(logfp);
|
2010-03-13 20:37:50 +03:00
|
|
|
strbuf_release(&sb);
|
2009-01-20 09:18:29 +03:00
|
|
|
return -1;
|
2009-07-17 01:25:18 +04:00
|
|
|
}
|
2009-01-20 09:18:29 +03:00
|
|
|
}
|
|
|
|
|
2010-03-13 20:37:50 +03:00
|
|
|
while (!strbuf_getwholeline(&sb, logfp, '\n')) {
|
2006-12-18 12:18:16 +03:00
|
|
|
unsigned char osha1[20], nsha1[20];
|
2007-01-08 03:59:54 +03:00
|
|
|
char *email_end, *message;
|
|
|
|
unsigned long timestamp;
|
2010-03-13 20:37:50 +03:00
|
|
|
int tz;
|
2006-12-18 12:18:16 +03:00
|
|
|
|
|
|
|
/* old SP new SP name <email> SP time TAB msg LF */
|
2010-03-13 20:37:50 +03:00
|
|
|
if (sb.len < 83 || sb.buf[sb.len - 1] != '\n' ||
|
|
|
|
get_sha1_hex(sb.buf, osha1) || sb.buf[40] != ' ' ||
|
|
|
|
get_sha1_hex(sb.buf + 41, nsha1) || sb.buf[81] != ' ' ||
|
|
|
|
!(email_end = strchr(sb.buf + 82, '>')) ||
|
2007-01-08 03:59:54 +03:00
|
|
|
email_end[1] != ' ' ||
|
|
|
|
!(timestamp = strtoul(email_end + 2, &message, 10)) ||
|
|
|
|
!message || message[0] != ' ' ||
|
|
|
|
(message[1] != '+' && message[1] != '-') ||
|
|
|
|
!isdigit(message[2]) || !isdigit(message[3]) ||
|
2007-02-09 02:59:47 +03:00
|
|
|
!isdigit(message[4]) || !isdigit(message[5]))
|
2006-12-18 12:18:16 +03:00
|
|
|
continue; /* corrupt? */
|
2007-01-08 03:59:54 +03:00
|
|
|
email_end[1] = '\0';
|
|
|
|
tz = strtol(message + 1, NULL, 10);
|
2007-02-09 02:59:47 +03:00
|
|
|
if (message[6] != '\t')
|
|
|
|
message += 6;
|
|
|
|
else
|
|
|
|
message += 7;
|
2010-03-13 20:37:50 +03:00
|
|
|
ret = fn(osha1, nsha1, sb.buf + 82, timestamp, tz, message,
|
|
|
|
cb_data);
|
2007-01-08 03:59:54 +03:00
|
|
|
if (ret)
|
2007-01-19 10:25:54 +03:00
|
|
|
break;
|
2006-12-18 12:18:16 +03:00
|
|
|
}
|
|
|
|
fclose(logfp);
|
2010-03-13 20:37:50 +03:00
|
|
|
strbuf_release(&sb);
|
2007-01-19 10:25:54 +03:00
|
|
|
return ret;
|
2006-12-18 12:18:16 +03:00
|
|
|
}
|
2006-12-19 09:07:45 +03:00
|
|
|
|
2009-01-20 09:18:29 +03:00
|
|
|
int for_each_reflog_ent(const char *ref, each_reflog_ent_fn fn, void *cb_data)
|
|
|
|
{
|
|
|
|
return for_each_recent_reflog_ent(ref, fn, 0, cb_data);
|
|
|
|
}
|
|
|
|
|
2007-02-03 21:25:43 +03:00
|
|
|
static int do_for_each_reflog(const char *base, each_ref_fn fn, void *cb_data)
|
|
|
|
{
|
|
|
|
DIR *dir = opendir(git_path("logs/%s", base));
|
2007-02-07 20:18:57 +03:00
|
|
|
int retval = 0;
|
2007-02-03 21:25:43 +03:00
|
|
|
|
|
|
|
if (dir) {
|
|
|
|
struct dirent *de;
|
|
|
|
int baselen = strlen(base);
|
|
|
|
char *log = xmalloc(baselen + 257);
|
|
|
|
|
|
|
|
memcpy(log, base, baselen);
|
|
|
|
if (baselen && base[baselen-1] != '/')
|
|
|
|
log[baselen++] = '/';
|
|
|
|
|
|
|
|
while ((de = readdir(dir)) != NULL) {
|
|
|
|
struct stat st;
|
|
|
|
int namelen;
|
|
|
|
|
|
|
|
if (de->d_name[0] == '.')
|
|
|
|
continue;
|
|
|
|
namelen = strlen(de->d_name);
|
|
|
|
if (namelen > 255)
|
|
|
|
continue;
|
|
|
|
if (has_extension(de->d_name, ".lock"))
|
|
|
|
continue;
|
|
|
|
memcpy(log + baselen, de->d_name, namelen+1);
|
|
|
|
if (stat(git_path("logs/%s", log), &st) < 0)
|
|
|
|
continue;
|
|
|
|
if (S_ISDIR(st.st_mode)) {
|
|
|
|
retval = do_for_each_reflog(log, fn, cb_data);
|
|
|
|
} else {
|
|
|
|
unsigned char sha1[20];
|
|
|
|
if (!resolve_ref(log, sha1, 0, NULL))
|
|
|
|
retval = error("bad ref for %s", log);
|
|
|
|
else
|
|
|
|
retval = fn(log, sha1, 0, cb_data);
|
|
|
|
}
|
|
|
|
if (retval)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
free(log);
|
|
|
|
closedir(dir);
|
|
|
|
}
|
2007-02-13 10:21:34 +03:00
|
|
|
else if (*base)
|
2007-02-07 20:18:57 +03:00
|
|
|
return errno;
|
2007-02-03 21:25:43 +03:00
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
int for_each_reflog(each_ref_fn fn, void *cb_data)
|
|
|
|
{
|
|
|
|
return do_for_each_reflog("", fn, cb_data);
|
|
|
|
}
|
2007-09-05 05:38:24 +04:00
|
|
|
|
|
|
|
int update_ref(const char *action, const char *refname,
|
|
|
|
const unsigned char *sha1, const unsigned char *oldval,
|
|
|
|
int flags, enum action_on_err onerr)
|
|
|
|
{
|
|
|
|
static struct ref_lock *lock;
|
|
|
|
lock = lock_any_ref_for_update(refname, oldval, flags);
|
|
|
|
if (!lock) {
|
|
|
|
const char *str = "Cannot lock the ref '%s'.";
|
|
|
|
switch (onerr) {
|
|
|
|
case MSG_ON_ERR: error(str, refname); break;
|
|
|
|
case DIE_ON_ERR: die(str, refname); break;
|
|
|
|
case QUIET_ON_ERR: break;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (write_ref_sha1(lock, sha1, action) < 0) {
|
|
|
|
const char *str = "Cannot update the ref '%s'.";
|
|
|
|
switch (onerr) {
|
|
|
|
case MSG_ON_ERR: error(str, refname); break;
|
|
|
|
case DIE_ON_ERR: die(str, refname); break;
|
|
|
|
case QUIET_ON_ERR: break;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2007-11-18 10:13:10 +03:00
|
|
|
|
2009-02-25 11:32:10 +03:00
|
|
|
struct ref *find_ref_by_name(const struct ref *list, const char *name)
|
2007-11-18 10:13:10 +03:00
|
|
|
{
|
|
|
|
for ( ; list; list = list->next)
|
|
|
|
if (!strcmp(list->name, name))
|
2009-02-25 11:32:10 +03:00
|
|
|
return (struct ref *)list;
|
2007-11-18 10:13:10 +03:00
|
|
|
return NULL;
|
|
|
|
}
|
2009-04-07 11:14:20 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* generate a format suitable for scanf from a ref_rev_parse_rules
|
|
|
|
* rule, that is replace the "%.*s" spec with a "%s" spec
|
|
|
|
*/
|
|
|
|
static void gen_scanf_fmt(char *scanf_fmt, const char *rule)
|
|
|
|
{
|
|
|
|
char *spec;
|
|
|
|
|
|
|
|
spec = strstr(rule, "%.*s");
|
|
|
|
if (!spec || strstr(spec + 4, "%.*s"))
|
|
|
|
die("invalid rule in ref_rev_parse_rules: %s", rule);
|
|
|
|
|
|
|
|
/* copy all until spec */
|
|
|
|
strncpy(scanf_fmt, rule, spec - rule);
|
|
|
|
scanf_fmt[spec - rule] = '\0';
|
|
|
|
/* copy new spec */
|
|
|
|
strcat(scanf_fmt, "%s");
|
|
|
|
/* copy remaining rule */
|
|
|
|
strcat(scanf_fmt, spec + 4);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-04-13 14:25:46 +04:00
|
|
|
char *shorten_unambiguous_ref(const char *ref, int strict)
|
2009-04-07 11:14:20 +04:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
static char **scanf_fmts;
|
|
|
|
static int nr_rules;
|
|
|
|
char *short_name;
|
|
|
|
|
|
|
|
/* pre generate scanf formats from ref_rev_parse_rules[] */
|
|
|
|
if (!nr_rules) {
|
|
|
|
size_t total_len = 0;
|
|
|
|
|
|
|
|
/* the rule list is NULL terminated, count them first */
|
|
|
|
for (; ref_rev_parse_rules[nr_rules]; nr_rules++)
|
|
|
|
/* no +1 because strlen("%s") < strlen("%.*s") */
|
|
|
|
total_len += strlen(ref_rev_parse_rules[nr_rules]);
|
|
|
|
|
|
|
|
scanf_fmts = xmalloc(nr_rules * sizeof(char *) + total_len);
|
|
|
|
|
|
|
|
total_len = 0;
|
|
|
|
for (i = 0; i < nr_rules; i++) {
|
|
|
|
scanf_fmts[i] = (char *)&scanf_fmts[nr_rules]
|
|
|
|
+ total_len;
|
|
|
|
gen_scanf_fmt(scanf_fmts[i], ref_rev_parse_rules[i]);
|
|
|
|
total_len += strlen(ref_rev_parse_rules[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* bail out if there are no rules */
|
|
|
|
if (!nr_rules)
|
|
|
|
return xstrdup(ref);
|
|
|
|
|
|
|
|
/* buffer for scanf result, at most ref must fit */
|
|
|
|
short_name = xstrdup(ref);
|
|
|
|
|
|
|
|
/* skip first rule, it will always match */
|
|
|
|
for (i = nr_rules - 1; i > 0 ; --i) {
|
|
|
|
int j;
|
2009-04-13 14:25:46 +04:00
|
|
|
int rules_to_fail = i;
|
2009-04-07 11:14:20 +04:00
|
|
|
int short_name_len;
|
|
|
|
|
|
|
|
if (1 != sscanf(ref, scanf_fmts[i], short_name))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
short_name_len = strlen(short_name);
|
|
|
|
|
2009-04-13 14:25:46 +04:00
|
|
|
/*
|
|
|
|
* in strict mode, all (except the matched one) rules
|
|
|
|
* must fail to resolve to a valid non-ambiguous ref
|
|
|
|
*/
|
|
|
|
if (strict)
|
|
|
|
rules_to_fail = nr_rules;
|
|
|
|
|
2009-04-07 11:14:20 +04:00
|
|
|
/*
|
|
|
|
* check if the short name resolves to a valid ref,
|
|
|
|
* but use only rules prior to the matched one
|
|
|
|
*/
|
2009-04-13 14:25:46 +04:00
|
|
|
for (j = 0; j < rules_to_fail; j++) {
|
2009-04-07 11:14:20 +04:00
|
|
|
const char *rule = ref_rev_parse_rules[j];
|
|
|
|
unsigned char short_objectname[20];
|
|
|
|
char refname[PATH_MAX];
|
|
|
|
|
2009-04-13 14:25:46 +04:00
|
|
|
/* skip matched rule */
|
|
|
|
if (i == j)
|
|
|
|
continue;
|
|
|
|
|
2009-04-07 11:14:20 +04:00
|
|
|
/*
|
|
|
|
* the short name is ambiguous, if it resolves
|
|
|
|
* (with this previous rule) to a valid ref
|
|
|
|
* read_ref() returns 0 on success
|
|
|
|
*/
|
|
|
|
mksnpath(refname, sizeof(refname),
|
|
|
|
rule, short_name_len, short_name);
|
|
|
|
if (!read_ref(refname, short_objectname))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* short name is non-ambiguous if all previous rules
|
|
|
|
* haven't resolved to a valid ref
|
|
|
|
*/
|
2009-04-13 14:25:46 +04:00
|
|
|
if (j == rules_to_fail)
|
2009-04-07 11:14:20 +04:00
|
|
|
return short_name;
|
|
|
|
}
|
|
|
|
|
|
|
|
free(short_name);
|
|
|
|
return xstrdup(ref);
|
|
|
|
}
|