Rename path_list to string_list
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>
This commit is contained in:

committed by
Junio C Hamano

parent
51ef1daa4a
commit
c455c87c5c
@ -3,7 +3,7 @@
|
||||
#include "refs.h"
|
||||
#include "diff.h"
|
||||
#include "revision.h"
|
||||
#include "path-list.h"
|
||||
#include "string-list.h"
|
||||
#include "reflog-walk.h"
|
||||
|
||||
struct complete_reflogs {
|
||||
@ -127,7 +127,7 @@ struct commit_reflog {
|
||||
|
||||
struct reflog_walk_info {
|
||||
struct commit_info_lifo reflogs;
|
||||
struct path_list complete_reflogs;
|
||||
struct string_list complete_reflogs;
|
||||
struct commit_reflog *last_commit_reflog;
|
||||
};
|
||||
|
||||
@ -141,7 +141,7 @@ int add_reflog_for_walk(struct reflog_walk_info *info,
|
||||
{
|
||||
unsigned long timestamp = 0;
|
||||
int recno = -1;
|
||||
struct path_list_item *item;
|
||||
struct string_list_item *item;
|
||||
struct complete_reflogs *reflogs;
|
||||
char *branch, *at = strchr(name, '@');
|
||||
struct commit_reflog *commit_reflog;
|
||||
@ -161,7 +161,7 @@ int add_reflog_for_walk(struct reflog_walk_info *info,
|
||||
} else
|
||||
recno = 0;
|
||||
|
||||
item = path_list_lookup(branch, &info->complete_reflogs);
|
||||
item = string_list_lookup(branch, &info->complete_reflogs);
|
||||
if (item)
|
||||
reflogs = item->util;
|
||||
else {
|
||||
@ -189,7 +189,7 @@ int add_reflog_for_walk(struct reflog_walk_info *info,
|
||||
}
|
||||
if (!reflogs || reflogs->nr == 0)
|
||||
return -1;
|
||||
path_list_insert(branch, &info->complete_reflogs)->util
|
||||
string_list_insert(branch, &info->complete_reflogs)->util
|
||||
= reflogs;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user