mirror of
https://github.com/git/git.git
synced 2024-12-01 14:03:34 +08:00
c455c87c5c
The name path_list was correct for the first usage of that data structure, but it really is a general-purpose string list. $ perl -i -pe 's/path-list/string-list/g' $(git grep -l path-list) $ perl -i -pe 's/path_list/string_list/g' $(git grep -l path_list) $ git mv path-list.h string-list.h $ git mv path-list.c string-list.c $ perl -i -pe 's/has_path/has_string/g' $(git grep -l has_path) $ perl -i -pe 's/path/string/g' string-list.[ch] $ git mv Documentation/technical/api-path-list.txt \ Documentation/technical/api-string-list.txt $ perl -i -pe 's/strdup_paths/strdup_strings/g' $(git grep -l strdup_paths) ... and then fix all users of string-list to access the member "string" instead of "path". Documentation/technical/api-string-list.txt needed some rewrapping, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
275 lines
6.7 KiB
C
275 lines
6.7 KiB
C
#include "cache.h"
|
|
#include "commit.h"
|
|
#include "refs.h"
|
|
#include "diff.h"
|
|
#include "revision.h"
|
|
#include "string-list.h"
|
|
#include "reflog-walk.h"
|
|
|
|
struct complete_reflogs {
|
|
char *ref;
|
|
struct reflog_info {
|
|
unsigned char osha1[20], nsha1[20];
|
|
char *email;
|
|
unsigned long timestamp;
|
|
int tz;
|
|
char *message;
|
|
} *items;
|
|
int nr, alloc;
|
|
};
|
|
|
|
static int read_one_reflog(unsigned char *osha1, unsigned char *nsha1,
|
|
const char *email, unsigned long timestamp, int tz,
|
|
const char *message, void *cb_data)
|
|
{
|
|
struct complete_reflogs *array = cb_data;
|
|
struct reflog_info *item;
|
|
|
|
if (array->nr >= array->alloc) {
|
|
array->alloc = alloc_nr(array->nr + 1);
|
|
array->items = xrealloc(array->items, array->alloc *
|
|
sizeof(struct reflog_info));
|
|
}
|
|
item = array->items + array->nr;
|
|
memcpy(item->osha1, osha1, 20);
|
|
memcpy(item->nsha1, nsha1, 20);
|
|
item->email = xstrdup(email);
|
|
item->timestamp = timestamp;
|
|
item->tz = tz;
|
|
item->message = xstrdup(message);
|
|
array->nr++;
|
|
return 0;
|
|
}
|
|
|
|
static struct complete_reflogs *read_complete_reflog(const char *ref)
|
|
{
|
|
struct complete_reflogs *reflogs =
|
|
xcalloc(sizeof(struct complete_reflogs), 1);
|
|
reflogs->ref = xstrdup(ref);
|
|
for_each_reflog_ent(ref, read_one_reflog, reflogs);
|
|
if (reflogs->nr == 0) {
|
|
unsigned char sha1[20];
|
|
const char *name = resolve_ref(ref, sha1, 1, NULL);
|
|
if (name)
|
|
for_each_reflog_ent(name, read_one_reflog, reflogs);
|
|
}
|
|
if (reflogs->nr == 0) {
|
|
int len = strlen(ref);
|
|
char *refname = xmalloc(len + 12);
|
|
sprintf(refname, "refs/%s", ref);
|
|
for_each_reflog_ent(refname, read_one_reflog, reflogs);
|
|
if (reflogs->nr == 0) {
|
|
sprintf(refname, "refs/heads/%s", ref);
|
|
for_each_reflog_ent(refname, read_one_reflog, reflogs);
|
|
}
|
|
free(refname);
|
|
}
|
|
return reflogs;
|
|
}
|
|
|
|
static int get_reflog_recno_by_time(struct complete_reflogs *array,
|
|
unsigned long timestamp)
|
|
{
|
|
int i;
|
|
for (i = array->nr - 1; i >= 0; i--)
|
|
if (timestamp >= array->items[i].timestamp)
|
|
return i;
|
|
return -1;
|
|
}
|
|
|
|
struct commit_info_lifo {
|
|
struct commit_info {
|
|
struct commit *commit;
|
|
void *util;
|
|
} *items;
|
|
int nr, alloc;
|
|
};
|
|
|
|
static struct commit_info *get_commit_info(struct commit *commit,
|
|
struct commit_info_lifo *lifo, int pop)
|
|
{
|
|
int i;
|
|
for (i = 0; i < lifo->nr; i++)
|
|
if (lifo->items[i].commit == commit) {
|
|
struct commit_info *result = &lifo->items[i];
|
|
if (pop) {
|
|
if (i + 1 < lifo->nr)
|
|
memmove(lifo->items + i,
|
|
lifo->items + i + 1,
|
|
(lifo->nr - i) *
|
|
sizeof(struct commit_info));
|
|
lifo->nr--;
|
|
}
|
|
return result;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static void add_commit_info(struct commit *commit, void *util,
|
|
struct commit_info_lifo *lifo)
|
|
{
|
|
struct commit_info *info;
|
|
if (lifo->nr >= lifo->alloc) {
|
|
lifo->alloc = alloc_nr(lifo->nr + 1);
|
|
lifo->items = xrealloc(lifo->items,
|
|
lifo->alloc * sizeof(struct commit_info));
|
|
}
|
|
info = lifo->items + lifo->nr;
|
|
info->commit = commit;
|
|
info->util = util;
|
|
lifo->nr++;
|
|
}
|
|
|
|
struct commit_reflog {
|
|
int flag, recno;
|
|
struct complete_reflogs *reflogs;
|
|
};
|
|
|
|
struct reflog_walk_info {
|
|
struct commit_info_lifo reflogs;
|
|
struct string_list complete_reflogs;
|
|
struct commit_reflog *last_commit_reflog;
|
|
};
|
|
|
|
void init_reflog_walk(struct reflog_walk_info** info)
|
|
{
|
|
*info = xcalloc(sizeof(struct reflog_walk_info), 1);
|
|
}
|
|
|
|
int add_reflog_for_walk(struct reflog_walk_info *info,
|
|
struct commit *commit, const char *name)
|
|
{
|
|
unsigned long timestamp = 0;
|
|
int recno = -1;
|
|
struct string_list_item *item;
|
|
struct complete_reflogs *reflogs;
|
|
char *branch, *at = strchr(name, '@');
|
|
struct commit_reflog *commit_reflog;
|
|
|
|
if (commit->object.flags & UNINTERESTING)
|
|
die ("Cannot walk reflogs for %s", name);
|
|
|
|
branch = xstrdup(name);
|
|
if (at && at[1] == '{') {
|
|
char *ep;
|
|
branch[at - name] = '\0';
|
|
recno = strtoul(at + 2, &ep, 10);
|
|
if (*ep != '}') {
|
|
recno = -1;
|
|
timestamp = approxidate(at + 2);
|
|
}
|
|
} else
|
|
recno = 0;
|
|
|
|
item = string_list_lookup(branch, &info->complete_reflogs);
|
|
if (item)
|
|
reflogs = item->util;
|
|
else {
|
|
if (*branch == '\0') {
|
|
unsigned char sha1[20];
|
|
const char *head = resolve_ref("HEAD", sha1, 0, NULL);
|
|
if (!head)
|
|
die ("No current branch");
|
|
free(branch);
|
|
branch = xstrdup(head);
|
|
}
|
|
reflogs = read_complete_reflog(branch);
|
|
if (!reflogs || reflogs->nr == 0) {
|
|
unsigned char sha1[20];
|
|
char *b;
|
|
if (dwim_log(branch, strlen(branch), sha1, &b) == 1) {
|
|
if (reflogs) {
|
|
free(reflogs->ref);
|
|
free(reflogs);
|
|
}
|
|
free(branch);
|
|
branch = b;
|
|
reflogs = read_complete_reflog(branch);
|
|
}
|
|
}
|
|
if (!reflogs || reflogs->nr == 0)
|
|
return -1;
|
|
string_list_insert(branch, &info->complete_reflogs)->util
|
|
= reflogs;
|
|
}
|
|
|
|
commit_reflog = xcalloc(sizeof(struct commit_reflog), 1);
|
|
if (recno < 0) {
|
|
commit_reflog->flag = 1;
|
|
commit_reflog->recno = get_reflog_recno_by_time(reflogs, timestamp);
|
|
if (commit_reflog->recno < 0) {
|
|
free(branch);
|
|
free(commit_reflog);
|
|
return -1;
|
|
}
|
|
} else
|
|
commit_reflog->recno = reflogs->nr - recno - 1;
|
|
commit_reflog->reflogs = reflogs;
|
|
|
|
add_commit_info(commit, commit_reflog, &info->reflogs);
|
|
return 0;
|
|
}
|
|
|
|
void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
|
|
{
|
|
struct commit_info *commit_info =
|
|
get_commit_info(commit, &info->reflogs, 0);
|
|
struct commit_reflog *commit_reflog;
|
|
struct reflog_info *reflog;
|
|
|
|
info->last_commit_reflog = NULL;
|
|
if (!commit_info)
|
|
return;
|
|
|
|
commit_reflog = commit_info->util;
|
|
if (commit_reflog->recno < 0) {
|
|
commit->parents = NULL;
|
|
return;
|
|
}
|
|
|
|
reflog = &commit_reflog->reflogs->items[commit_reflog->recno];
|
|
info->last_commit_reflog = commit_reflog;
|
|
commit_reflog->recno--;
|
|
commit_info->commit = (struct commit *)parse_object(reflog->osha1);
|
|
if (!commit_info->commit) {
|
|
commit->parents = NULL;
|
|
return;
|
|
}
|
|
|
|
commit->parents = xcalloc(sizeof(struct commit_list), 1);
|
|
commit->parents->item = commit_info->commit;
|
|
commit->object.flags &= ~(ADDED | SEEN | SHOWN);
|
|
}
|
|
|
|
void show_reflog_message(struct reflog_walk_info* info, int oneline,
|
|
int relative_date)
|
|
{
|
|
if (info && info->last_commit_reflog) {
|
|
struct commit_reflog *commit_reflog = info->last_commit_reflog;
|
|
struct reflog_info *info;
|
|
|
|
info = &commit_reflog->reflogs->items[commit_reflog->recno+1];
|
|
if (oneline) {
|
|
printf("%s@{", commit_reflog->reflogs->ref);
|
|
if (commit_reflog->flag || relative_date)
|
|
printf("%s", show_date(info->timestamp, 0, 1));
|
|
else
|
|
printf("%d", commit_reflog->reflogs->nr
|
|
- 2 - commit_reflog->recno);
|
|
printf("}: %s", info->message);
|
|
}
|
|
else {
|
|
printf("Reflog: %s@{", commit_reflog->reflogs->ref);
|
|
if (commit_reflog->flag || relative_date)
|
|
printf("%s", show_date(info->timestamp,
|
|
info->tz,
|
|
relative_date));
|
|
else
|
|
printf("%d", commit_reflog->reflogs->nr
|
|
- 2 - commit_reflog->recno);
|
|
printf("} (%s)\nReflog message: %s",
|
|
info->email, info->message);
|
|
}
|
|
}
|
|
}
|