microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

sha1_name: convert GET_SHA1* flags to GET_OID* 

Convert the flags for get_oid_with_context and friends to use "OID"
instead of "SHA1" in their names.

This transform was made by running the following one-liner on the
affected files:

  perl -pi -e 's/GET_SHA1/GET_OID/g'

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson 2017-07-13 23:49:29 +00:00 коммит произвёл Junio C Hamano
Родитель e82caf384b
Коммит 321c89bf5f
8 изменённых файлов: 55 добавлений и 55 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
builtin/cat-file.c
Просмотреть файл

@ -63,7 +63,7 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
if (unknown_type) if (unknown_type)
flags |= OBJECT_INFO_ALLOW_UNKNOWN_TYPE; flags |= OBJECT_INFO_ALLOW_UNKNOWN_TYPE;
if (get_oid_with_context(obj_name, GET_SHA1_RECORD_PATH, if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH,
&oid, &obj_context)) &oid, &obj_context))
die("Not a valid object name %s", obj_name); die("Not a valid object name %s", obj_name);
@ -361,7 +361,7 @@ static void batch_one_object(const char *obj_name, struct batch_options *opt,
struct expand_data *data) struct expand_data *data)
{ {
struct object_context ctx; struct object_context ctx;
int flags = opt->follow_symlinks ? GET_SHA1_FOLLOW_SYMLINKS : 0; int flags = opt->follow_symlinks ? GET_OID_FOLLOW_SYMLINKS : 0;
enum follow_symlinks_result result; enum follow_symlinks_result result;
result = get_oid_with_context(obj_name, flags, &data->oid, &ctx); result = get_oid_with_context(obj_name, flags, &data->oid, &ctx);

2
builtin/grep.c
Просмотреть файл

@ -1207,7 +1207,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
break; break;
} }
if (get_oid_with_context(arg, GET_SHA1_RECORD_PATH, if (get_oid_with_context(arg, GET_OID_RECORD_PATH,
&oid, &oc)) { &oid, &oc)) {
if (seen_dashdash) if (seen_dashdash)
die(_("unable to resolve revision: %s"), arg); die(_("unable to resolve revision: %s"), arg);

2
builtin/log.c
Просмотреть файл

@ -484,7 +484,7 @@ static int show_blob_object(const struct object_id *oid, struct rev_info *rev, c
!DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV)) !DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV))
return stream_blob_to_fd(1, oid, NULL, 0); return stream_blob_to_fd(1, oid, NULL, 0);
if (get_oid_with_context(obj_name, GET_SHA1_RECORD_PATH, if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH,
&oidc, &obj_context)) &oidc, &obj_context))
die(_("Not a valid object name %s"), obj_name); die(_("Not a valid object name %s"), obj_name);
if (!obj_context.path || if (!obj_context.path ||

2
builtin/rev-parse.c
Просмотреть файл

@ -702,7 +702,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
} }
if (!strcmp(arg, "--quiet") || !strcmp(arg, "-q")) { if (!strcmp(arg, "--quiet") || !strcmp(arg, "-q")) {
quiet = 1; quiet = 1;
flags |= GET_SHA1_QUIETLY; flags |= GET_OID_QUIETLY;
continue; continue;
} }
if (opt_with_value(arg, "--short", &arg)) { if (opt_with_value(arg, "--short", &arg)) {

28
cache.h
Просмотреть файл

@ -1283,27 +1283,27 @@ struct object_context {
*/ */
struct strbuf symlink_path; struct strbuf symlink_path;
/* /*
* If GET_SHA1_RECORD_PATH is set, this will record path (if any) * If GET_OID_RECORD_PATH is set, this will record path (if any)
* found when resolving the name. The caller is responsible for * found when resolving the name. The caller is responsible for
* releasing the memory. * releasing the memory.
*/ */
char *path; char *path;
}; };
#define GET_SHA1_QUIETLY 01 #define GET_OID_QUIETLY 01
#define GET_SHA1_COMMIT 02 #define GET_OID_COMMIT 02
#define GET_SHA1_COMMITTISH 04 #define GET_OID_COMMITTISH 04
#define GET_SHA1_TREE 010 #define GET_OID_TREE 010
#define GET_SHA1_TREEISH 020 #define GET_OID_TREEISH 020
#define GET_SHA1_BLOB 040 #define GET_OID_BLOB 040
#define GET_SHA1_FOLLOW_SYMLINKS 0100 #define GET_OID_FOLLOW_SYMLINKS 0100
#define GET_SHA1_RECORD_PATH 0200 #define GET_OID_RECORD_PATH 0200
#define GET_SHA1_ONLY_TO_DIE 04000 #define GET_OID_ONLY_TO_DIE 04000
#define GET_SHA1_DISAMBIGUATORS \ #define GET_OID_DISAMBIGUATORS \
(GET_SHA1_COMMIT | GET_SHA1_COMMITTISH | \ (GET_OID_COMMIT | GET_OID_COMMITTISH | \
GET_SHA1_TREE | GET_SHA1_TREEISH | \ GET_OID_TREE | GET_OID_TREEISH | \
GET_SHA1_BLOB) GET_OID_BLOB)
extern int get_oid(const char *str, struct object_id *oid); extern int get_oid(const char *str, struct object_id *oid);
extern int get_oid_commit(const char *str, struct object_id *oid); extern int get_oid_commit(const char *str, struct object_id *oid);

2
refs.c
Просмотреть файл

@ -818,7 +818,7 @@ int read_ref_at(const char *refname, unsigned int flags, timestamp_t at_time, in
for_each_reflog_ent_reverse(refname, read_ref_at_ent, &cb); for_each_reflog_ent_reverse(refname, read_ref_at_ent, &cb);
if (!cb.reccnt) { if (!cb.reccnt) {
if (flags & GET_SHA1_QUIETLY) if (flags & GET_OID_QUIETLY)
exit(128); exit(128);
else else
die("Log for %s is empty.", refname); die("Log for %s is empty.", refname);

6
revision.c
Просмотреть файл

@ -1453,7 +1453,7 @@ static int handle_dotdot_1(const char *arg, char *dotdot,
unsigned int a_flags, b_flags; unsigned int a_flags, b_flags;
int symmetric = 0; int symmetric = 0;
unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM); unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
unsigned int oc_flags = GET_SHA1_COMMITTISH | GET_SHA1_RECORD_PATH; unsigned int oc_flags = GET_OID_COMMITTISH | GET_OID_RECORD_PATH;
a_name = arg; a_name = arg;
if (!*a_name) if (!*a_name)
@ -1549,7 +1549,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
int local_flags; int local_flags;
const char *arg = arg_; const char *arg = arg_;
int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME; int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
unsigned get_sha1_flags = GET_SHA1_RECORD_PATH; unsigned get_sha1_flags = GET_OID_RECORD_PATH;
flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM; flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
@ -1600,7 +1600,7 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
} }
if (revarg_opt & REVARG_COMMITTISH) if (revarg_opt & REVARG_COMMITTISH)
get_sha1_flags |= GET_SHA1_COMMITTISH; get_sha1_flags |= GET_OID_COMMITTISH;
if (get_oid_with_context(arg, get_sha1_flags, &oid, &oc)) if (get_oid_with_context(arg, get_sha1_flags, &oid, &oc))
return revs->ignore_missing ? 0 : -1; return revs->ignore_missing ? 0 : -1;

64
sha1_name.c
Просмотреть файл

@ -390,23 +390,23 @@ static int get_short_oid(const char *name, int len, struct object_id *oid,
{ {
int status; int status;
struct disambiguate_state ds; struct disambiguate_state ds;
int quietly = !!(flags & GET_SHA1_QUIETLY); int quietly = !!(flags & GET_OID_QUIETLY);
if (init_object_disambiguation(name, len, &ds) < 0) if (init_object_disambiguation(name, len, &ds) < 0)
return -1; return -1;
if (HAS_MULTI_BITS(flags & GET_SHA1_DISAMBIGUATORS)) if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS))
die("BUG: multiple get_short_oid disambiguator flags"); die("BUG: multiple get_short_oid disambiguator flags");
if (flags & GET_SHA1_COMMIT) if (flags & GET_OID_COMMIT)
ds.fn = disambiguate_commit_only; ds.fn = disambiguate_commit_only;
else if (flags & GET_SHA1_COMMITTISH) else if (flags & GET_OID_COMMITTISH)
ds.fn = disambiguate_committish_only; ds.fn = disambiguate_committish_only;
else if (flags & GET_SHA1_TREE) else if (flags & GET_OID_TREE)
ds.fn = disambiguate_tree_only; ds.fn = disambiguate_tree_only;
else if (flags & GET_SHA1_TREEISH) else if (flags & GET_OID_TREEISH)
ds.fn = disambiguate_treeish_only; ds.fn = disambiguate_treeish_only;
else if (flags & GET_SHA1_BLOB) else if (flags & GET_OID_BLOB)
ds.fn = disambiguate_blob_only; ds.fn = disambiguate_blob_only;
else else
ds.fn = default_disambiguate_hint; ds.fn = default_disambiguate_hint;
@ -505,7 +505,7 @@ int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
exists = has_sha1_file(sha1); exists = has_sha1_file(sha1);
while (len < 40) { while (len < 40) {
struct object_id oid_ret; struct object_id oid_ret;
status = get_short_oid(hex, len, &oid_ret, GET_SHA1_QUIETLY); status = get_short_oid(hex, len, &oid_ret, GET_OID_QUIETLY);
if (exists if (exists
? !status ? !status
: status == SHORT_NAME_NOT_FOUND) { : status == SHORT_NAME_NOT_FOUND) {
@ -662,9 +662,9 @@ static int get_oid_basic(const char *str, int len, struct object_id *oid,
if (!refs_found) if (!refs_found)
return -1; return -1;
if (warn_ambiguous_refs && !(flags & GET_SHA1_QUIETLY) && if (warn_ambiguous_refs && !(flags & GET_OID_QUIETLY) &&
(refs_found > 1 || (refs_found > 1 ||
!get_short_oid(str, len, &tmp_oid, GET_SHA1_QUIETLY))) !get_short_oid(str, len, &tmp_oid, GET_OID_QUIETLY)))
warning(warn_msg, len, str); warning(warn_msg, len, str);
if (reflog_len) { if (reflog_len) {
@ -709,13 +709,13 @@ static int get_oid_basic(const char *str, int len, struct object_id *oid,
} }
} }
if (at_time) { if (at_time) {
if (!(flags & GET_SHA1_QUIETLY)) { if (!(flags & GET_OID_QUIETLY)) {
warning("Log for '%.*s' only goes " warning("Log for '%.*s' only goes "
"back to %s.", len, str, "back to %s.", len, str,
show_date(co_time, co_tz, DATE_MODE(RFC2822))); show_date(co_time, co_tz, DATE_MODE(RFC2822)));
} }
} else { } else {
if (flags & GET_SHA1_QUIETLY) { if (flags & GET_OID_QUIETLY) {
exit(128); exit(128);
} }
die("Log for '%.*s' only has %d entries.", die("Log for '%.*s' only has %d entries.",
@ -732,7 +732,7 @@ static int get_parent(const char *name, int len,
struct object_id *result, int idx) struct object_id *result, int idx)
{ {
struct object_id oid; struct object_id oid;
int ret = get_oid_1(name, len, &oid, GET_SHA1_COMMITTISH); int ret = get_oid_1(name, len, &oid, GET_OID_COMMITTISH);
struct commit *commit; struct commit *commit;
struct commit_list *p; struct commit_list *p;
@ -763,7 +763,7 @@ static int get_nth_ancestor(const char *name, int len,
struct commit *commit; struct commit *commit;
int ret; int ret;
ret = get_oid_1(name, len, &oid, GET_SHA1_COMMITTISH); ret = get_oid_1(name, len, &oid, GET_OID_COMMITTISH);
if (ret) if (ret)
return ret; return ret;
commit = lookup_commit_reference(&oid); commit = lookup_commit_reference(&oid);
@ -849,11 +849,11 @@ static int peel_onion(const char *name, int len, struct object_id *oid,
else else
return -1; return -1;
lookup_flags &= ~GET_SHA1_DISAMBIGUATORS; lookup_flags &= ~GET_OID_DISAMBIGUATORS;
if (expected_type == OBJ_COMMIT) if (expected_type == OBJ_COMMIT)
lookup_flags |= GET_SHA1_COMMITTISH; lookup_flags |= GET_OID_COMMITTISH;
else if (expected_type == OBJ_TREE) else if (expected_type == OBJ_TREE)
lookup_flags |= GET_SHA1_TREEISH; lookup_flags |= GET_OID_TREEISH;
if (get_oid_1(name, sp - name - 2, &outer, lookup_flags)) if (get_oid_1(name, sp - name - 2, &outer, lookup_flags))
return -1; return -1;
@ -904,7 +904,7 @@ static int peel_onion(const char *name, int len, struct object_id *oid,
static int get_describe_name(const char *name, int len, struct object_id *oid) static int get_describe_name(const char *name, int len, struct object_id *oid)
{ {
const char *cp; const char *cp;
unsigned flags = GET_SHA1_QUIETLY | GET_SHA1_COMMIT; unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;
for (cp = name + len - 1; name + 2 <= cp; cp--) { for (cp = name + len - 1; name + 2 <= cp; cp--) {
char ch = *cp; char ch = *cp;
@ -1361,35 +1361,35 @@ int get_oid(const char *name, struct object_id *oid)
int get_oid_committish(const char *name, struct object_id *oid) int get_oid_committish(const char *name, struct object_id *oid)
{ {
struct object_context unused; struct object_context unused;
return get_oid_with_context(name, GET_SHA1_COMMITTISH, return get_oid_with_context(name, GET_OID_COMMITTISH,
oid, &unused); oid, &unused);
} }
int get_oid_treeish(const char *name, struct object_id *oid) int get_oid_treeish(const char *name, struct object_id *oid)
{ {
struct object_context unused; struct object_context unused;
return get_oid_with_context(name, GET_SHA1_TREEISH, return get_oid_with_context(name, GET_OID_TREEISH,
oid, &unused); oid, &unused);
} }
int get_oid_commit(const char *name, struct object_id *oid) int get_oid_commit(const char *name, struct object_id *oid)
{ {
struct object_context unused; struct object_context unused;
return get_oid_with_context(name, GET_SHA1_COMMIT, return get_oid_with_context(name, GET_OID_COMMIT,
oid, &unused); oid, &unused);
} }
int get_oid_tree(const char *name, struct object_id *oid) int get_oid_tree(const char *name, struct object_id *oid)
{ {
struct object_context unused; struct object_context unused;
return get_oid_with_context(name, GET_SHA1_TREE, return get_oid_with_context(name, GET_OID_TREE,
oid, &unused); oid, &unused);
} }
int get_oid_blob(const char *name, struct object_id *oid) int get_oid_blob(const char *name, struct object_id *oid)
{ {
struct object_context unused; struct object_context unused;
return get_oid_with_context(name, GET_SHA1_BLOB, return get_oid_with_context(name, GET_OID_BLOB,
oid, &unused); oid, &unused);
} }
@ -1505,10 +1505,10 @@ static int get_oid_with_context_1(const char *name,
int ret, bracket_depth; int ret, bracket_depth;
int namelen = strlen(name); int namelen = strlen(name);
const char *cp; const char *cp;
int only_to_die = flags & GET_SHA1_ONLY_TO_DIE; int only_to_die = flags & GET_OID_ONLY_TO_DIE;
if (only_to_die) if (only_to_die)
flags |= GET_SHA1_QUIETLY; flags |= GET_OID_QUIETLY;
memset(oc, 0, sizeof(*oc)); memset(oc, 0, sizeof(*oc));
oc->mode = S_IFINVALID; oc->mode = S_IFINVALID;
@ -1551,7 +1551,7 @@ static int get_oid_with_context_1(const char *name,
namelen = strlen(cp); namelen = strlen(cp);
} }
if (flags & GET_SHA1_RECORD_PATH) if (flags & GET_OID_RECORD_PATH)
oc->path = xstrdup(cp); oc->path = xstrdup(cp);
if (!active_cache) if (!active_cache)
@ -1590,8 +1590,8 @@ static int get_oid_with_context_1(const char *name,
int len = cp - name; int len = cp - name;
unsigned sub_flags = flags; unsigned sub_flags = flags;
sub_flags &= ~GET_SHA1_DISAMBIGUATORS; sub_flags &= ~GET_OID_DISAMBIGUATORS;
sub_flags |= GET_SHA1_TREEISH; sub_flags |= GET_OID_TREEISH;
if (!get_oid_1(name, len, &tree_oid, sub_flags)) { if (!get_oid_1(name, len, &tree_oid, sub_flags)) {
const char *filename = cp+1; const char *filename = cp+1;
@ -1600,7 +1600,7 @@ static int get_oid_with_context_1(const char *name,
new_filename = resolve_relative_path(filename); new_filename = resolve_relative_path(filename);
if (new_filename) if (new_filename)
filename = new_filename; filename = new_filename;
if (flags & GET_SHA1_FOLLOW_SYMLINKS) { if (flags & GET_OID_FOLLOW_SYMLINKS) {
ret = get_tree_entry_follow_symlinks(tree_oid.hash, ret = get_tree_entry_follow_symlinks(tree_oid.hash,
filename, oid->hash, &oc->symlink_path, filename, oid->hash, &oc->symlink_path,
&oc->mode); &oc->mode);
@ -1615,7 +1615,7 @@ static int get_oid_with_context_1(const char *name,
} }
} }
hashcpy(oc->tree, tree_oid.hash); hashcpy(oc->tree, tree_oid.hash);
if (flags & GET_SHA1_RECORD_PATH) if (flags & GET_OID_RECORD_PATH)
oc->path = xstrdup(filename); oc->path = xstrdup(filename);
free(new_filename); free(new_filename);
@ -1639,12 +1639,12 @@ void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
{ {
struct object_context oc; struct object_context oc;
struct object_id oid; struct object_id oid;
get_oid_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, &oid, &oc); get_oid_with_context_1(name, GET_OID_ONLY_TO_DIE, prefix, &oid, &oc);
} }
int get_oid_with_context(const char *str, unsigned flags, struct object_id *oid, struct object_context *oc) int get_oid_with_context(const char *str, unsigned flags, struct object_id *oid, struct object_context *oc)
{ {
if (flags & GET_SHA1_FOLLOW_SYMLINKS && flags & GET_SHA1_ONLY_TO_DIE) if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
die("BUG: incompatible flags for get_sha1_with_context"); die("BUG: incompatible flags for get_sha1_with_context");
return get_oid_with_context_1(str, flags, NULL, oid, oc); return get_oid_with_context_1(str, flags, NULL, oid, oc);
} }