undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

handle_revision_arg: record paths for pending objects

Browse Source 
If the revision parser sees an argument like tree:path, we
parse it down to the correct blob (or tree), but throw away
the "path" portion. Let's ask get_sha1_with_context() to
record it, and pass it along in the pending array.

This will let programs like git-diff which rely on the
revision-parser show more accurate paths.

Note that the implementation is a little tricky; we have to
make sure we free oc.path in all code paths. For handle_dotdot(),
we can piggy-back on the existing cleanup-wrapper pattern.
The real work happens in handle_dotdot_1(), but the
handle_dotdot() wrapper makes sure that the path is freed no
matter how we exit the function (and for that reason we make
sure that the object_context struct is zero'd, so if we fail
to even get to the get_sha1_with_context() call, we just end
up calling free(NULL)).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2017-05-19 08:55:26 -04:00 committed by Junio C Hamano
parent 101dd4de16
commit 18f1ad7639
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
revision.c
View File

@ -1443,16 +1443,17 @@ static int dotdot_missing(const char *arg, char *dotdot,
static int handle_dotdot_1(const char *arg, char *dotdot, static int handle_dotdot_1(const char *arg, char *dotdot,
struct rev_info *revs, int flags, struct rev_info *revs, int flags,
int cant_be_filename) int cant_be_filename,
struct object_context *a_oc,
struct object_context *b_oc)
{ {
const char *a_name, *b_name; const char *a_name, *b_name;
struct object_id a_oid, b_oid; struct object_id a_oid, b_oid;
struct object *a_obj, *b_obj; struct object *a_obj, *b_obj;
struct object_context a_oc, b_oc;
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; unsigned int oc_flags = GET_SHA1_COMMITTISH | GET_SHA1_RECORD_PATH;
a_name = arg; a_name = arg;
if (!*a_name) if (!*a_name)
@ -1466,8 +1467,8 @@ static int handle_dotdot_1(const char *arg, char *dotdot,
if (!*b_name) if (!*b_name)
b_name = "HEAD"; b_name = "HEAD";
if (get_sha1_with_context(a_name, oc_flags, a_oid.hash, &a_oc) || if (get_sha1_with_context(a_name, oc_flags, a_oid.hash, a_oc) ||
get_sha1_with_context(b_name, oc_flags, b_oid.hash, &b_oc)) get_sha1_with_context(b_name, oc_flags, b_oid.hash, b_oc))
return -1; return -1;
if (!cant_be_filename) { if (!cant_be_filename) {
@ -1509,8 +1510,8 @@ static int handle_dotdot_1(const char *arg, char *dotdot,
b_obj->flags |= b_flags; b_obj->flags |= b_flags;
add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags); add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags);
add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags); add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags);
add_pending_object_with_mode(revs, a_obj, a_name, a_oc.mode); add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path);
add_pending_object_with_mode(revs, b_obj, b_name, b_oc.mode); add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path);
return 0; return 0;
} }
@ -1518,16 +1519,24 @@ static int handle_dotdot(const char *arg,
struct rev_info *revs, int flags, struct rev_info *revs, int flags,
int cant_be_filename) int cant_be_filename)
{ {
struct object_context a_oc, b_oc;
char *dotdot = strstr(arg, ".."); char *dotdot = strstr(arg, "..");
int ret; int ret;
if (!dotdot) if (!dotdot)
return -1; return -1;
memset(&a_oc, 0, sizeof(a_oc));
memset(&b_oc, 0, sizeof(b_oc));
*dotdot = '\0'; *dotdot = '\0';
ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename); ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename,
&a_oc, &b_oc);
*dotdot = '.'; *dotdot = '.';
free(a_oc.path);
free(b_oc.path);
return ret; return ret;
} }
@ -1540,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 = 0; unsigned get_sha1_flags = GET_SHA1_RECORD_PATH;
flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM; flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
@ -1591,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_SHA1_COMMITTISH;
if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc)) if (get_sha1_with_context(arg, get_sha1_flags, sha1, &oc))
return revs->ignore_missing ? 0 : -1; return revs->ignore_missing ? 0 : -1;
@ -1599,7 +1608,8 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
verify_non_filename(revs->prefix, arg); verify_non_filename(revs->prefix, arg);
object = get_reference(revs, arg, sha1, flags ^ local_flags); object = get_reference(revs, arg, sha1, flags ^ local_flags);
add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags); add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
add_pending_object_with_mode(revs, object, arg, oc.mode); add_pending_object_with_path(revs, object, arg, oc.mode, oc.path);
free(oc.path);
return 0; return 0;
} }