зеркало из https://github.com/microsoft/git.git
blame: move origin-related methods to libgit
Signed-off-by: Jeff Smith <whydoubt@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
dc076ae5d9
Коммит
f5dd754c36
1
Makefile
1
Makefile
|
@ -718,6 +718,7 @@ LIB_OBJS += argv-array.o
|
|||
LIB_OBJS += attr.o
|
||||
LIB_OBJS += base85.o
|
||||
LIB_OBJS += bisect.o
|
||||
LIB_OBJS += blame.o
|
||||
LIB_OBJS += blob.o
|
||||
LIB_OBJS += branch.o
|
||||
LIB_OBJS += bulk-checkin.o
|
||||
|
|
|
@ -0,0 +1,62 @@
|
|||
#include "blame.h"
|
||||
|
||||
void blame_origin_decref(struct blame_origin *o)
|
||||
{
|
||||
if (o && --o->refcnt <= 0) {
|
||||
struct blame_origin *p, *l = NULL;
|
||||
if (o->previous)
|
||||
blame_origin_decref(o->previous);
|
||||
free(o->file.ptr);
|
||||
/* Should be present exactly once in commit chain */
|
||||
for (p = o->commit->util; p; l = p, p = p->next) {
|
||||
if (p == o) {
|
||||
if (l)
|
||||
l->next = p->next;
|
||||
else
|
||||
o->commit->util = p->next;
|
||||
free(o);
|
||||
return;
|
||||
}
|
||||
}
|
||||
die("internal error in blame_origin_decref");
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Given a commit and a path in it, create a new origin structure.
|
||||
* The callers that add blame to the scoreboard should use
|
||||
* get_origin() to obtain shared, refcounted copy instead of calling
|
||||
* this function directly.
|
||||
*/
|
||||
struct blame_origin *make_origin(struct commit *commit, const char *path)
|
||||
{
|
||||
struct blame_origin *o;
|
||||
FLEX_ALLOC_STR(o, path, path);
|
||||
o->commit = commit;
|
||||
o->refcnt = 1;
|
||||
o->next = commit->util;
|
||||
commit->util = o;
|
||||
return o;
|
||||
}
|
||||
|
||||
/*
|
||||
* Locate an existing origin or create a new one.
|
||||
* This moves the origin to front position in the commit util list.
|
||||
*/
|
||||
struct blame_origin *get_origin(struct commit *commit, const char *path)
|
||||
{
|
||||
struct blame_origin *o, *l;
|
||||
|
||||
for (o = commit->util, l = NULL; o; l = o, o = o->next) {
|
||||
if (!strcmp(o->path, path)) {
|
||||
/* bump to front */
|
||||
if (l) {
|
||||
l->next = o->next;
|
||||
o->next = commit->util;
|
||||
commit->util = o;
|
||||
}
|
||||
return blame_origin_incref(o);
|
||||
}
|
||||
}
|
||||
return make_origin(commit, path);
|
||||
}
|
15
blame.h
15
blame.h
|
@ -140,4 +140,19 @@ struct blame_scoreboard {
|
|||
void *found_guilty_entry_data;
|
||||
};
|
||||
|
||||
/*
|
||||
* Origin is refcounted and usually we keep the blob contents to be
|
||||
* reused.
|
||||
*/
|
||||
static inline struct blame_origin *blame_origin_incref(struct blame_origin *o)
|
||||
{
|
||||
if (o)
|
||||
o->refcnt++;
|
||||
return o;
|
||||
}
|
||||
extern void blame_origin_decref(struct blame_origin *o);
|
||||
|
||||
extern struct blame_origin *make_origin(struct commit *commit, const char *path);
|
||||
extern struct blame_origin *get_origin(struct commit *commit, const char *path);
|
||||
|
||||
#endif /* BLAME_H */
|
||||
|
|
|
@ -124,39 +124,6 @@ static void fill_origin_blob(struct diff_options *opt,
|
|||
*file = o->file;
|
||||
}
|
||||
|
||||
/*
|
||||
* Origin is refcounted and usually we keep the blob contents to be
|
||||
* reused.
|
||||
*/
|
||||
static inline struct blame_origin *blame_origin_incref(struct blame_origin *o)
|
||||
{
|
||||
if (o)
|
||||
o->refcnt++;
|
||||
return o;
|
||||
}
|
||||
|
||||
static void blame_origin_decref(struct blame_origin *o)
|
||||
{
|
||||
if (o && --o->refcnt <= 0) {
|
||||
struct blame_origin *p, *l = NULL;
|
||||
if (o->previous)
|
||||
blame_origin_decref(o->previous);
|
||||
free(o->file.ptr);
|
||||
/* Should be present exactly once in commit chain */
|
||||
for (p = o->commit->util; p; l = p, p = p->next) {
|
||||
if (p == o) {
|
||||
if (l)
|
||||
l->next = p->next;
|
||||
else
|
||||
o->commit->util = p->next;
|
||||
free(o);
|
||||
return;
|
||||
}
|
||||
}
|
||||
die("internal error in blame_origin_decref");
|
||||
}
|
||||
}
|
||||
|
||||
static void drop_origin_blob(struct blame_origin *o)
|
||||
{
|
||||
if (o->file.ptr) {
|
||||
|
@ -315,45 +282,6 @@ static void queue_blames(struct blame_scoreboard *sb, struct blame_origin *porig
|
|||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Given a commit and a path in it, create a new origin structure.
|
||||
* The callers that add blame to the scoreboard should use
|
||||
* get_origin() to obtain shared, refcounted copy instead of calling
|
||||
* this function directly.
|
||||
*/
|
||||
static struct blame_origin *make_origin(struct commit *commit, const char *path)
|
||||
{
|
||||
struct blame_origin *o;
|
||||
FLEX_ALLOC_STR(o, path, path);
|
||||
o->commit = commit;
|
||||
o->refcnt = 1;
|
||||
o->next = commit->util;
|
||||
commit->util = o;
|
||||
return o;
|
||||
}
|
||||
|
||||
/*
|
||||
* Locate an existing origin or create a new one.
|
||||
* This moves the origin to front position in the commit util list.
|
||||
*/
|
||||
static struct blame_origin *get_origin(struct commit *commit, const char *path)
|
||||
{
|
||||
struct blame_origin *o, *l;
|
||||
|
||||
for (o = commit->util, l = NULL; o; l = o, o = o->next) {
|
||||
if (!strcmp(o->path, path)) {
|
||||
/* bump to front */
|
||||
if (l) {
|
||||
l->next = o->next;
|
||||
o->next = commit->util;
|
||||
commit->util = o;
|
||||
}
|
||||
return blame_origin_incref(o);
|
||||
}
|
||||
}
|
||||
return make_origin(commit, path);
|
||||
}
|
||||
|
||||
/*
|
||||
* Fill the blob_sha1 field of an origin if it hasn't, so that later
|
||||
* call to fill_origin_blob() can use it to locate the data. blob_sha1
|
||||
|
|
Загрузка…
Ссылка в новой задаче