mirror of
https://github.com/git/git.git
synced 2024-11-24 18:33:43 +08:00
5cc044e025
Change the output emitted when an ambiguous object is encountered so
that we show tags first, then commits, followed by trees, and finally
blobs. Within each type we show objects in hashcmp() order. Before
this change the objects were only ordered by hashcmp().
The reason for doing this is that the output looks better as a result,
e.g. the v2.17.0 tag before this change on "git show e8f2" would
display:
hint: The candidates are:
hint: e8f2093055 tree
hint: e8f21caf94 commit 2013-06-24 - bash prompt: print unique detached HEAD abbreviated object name
hint: e8f21d02f7 blob
hint: e8f21d577c blob
hint: e8f25a3a50 tree
hint: e8f26250fa commit 2017-02-03 - Merge pull request #996 from jeffhostetler/jeffhostetler/register_rename_src
hint: e8f2650052 tag v2.17.0
hint: e8f2867228 blob
hint: e8f28d537c tree
hint: e8f2a35526 blob
hint: e8f2bc0c06 commit 2015-05-10 - Documentation: note behavior for multiple remote.url entries
hint: e8f2cf6ec0 tree
Now we'll instead show:
hint: e8f2650052 tag v2.17.0
hint: e8f21caf94 commit 2013-06-24 - bash prompt: print unique detached HEAD abbreviated object name
hint: e8f26250fa commit 2017-02-03 - Merge pull request #996 from jeffhostetler/jeffhostetler/register_rename_src
hint: e8f2bc0c06 commit 2015-05-10 - Documentation: note behavior for multiple remote.url entries
hint: e8f2093055 tree
hint: e8f25a3a50 tree
hint: e8f28d537c tree
hint: e8f2cf6ec0 tree
hint: e8f21d02f7 blob
hint: e8f21d577c blob
hint: e8f2867228 blob
hint: e8f2a35526 blob
Since we show the commit data in the output that's nicely aligned once
we sort by object type. The decision to show tags before commits is
pretty arbitrary. I don't want to order by object_type since there
tags come last after blobs, which doesn't make sense if we want to
show the most important things first.
I could display them after commits, but it's much less likely that
we'll display a tag, so if there is one it makes sense to show it
prominently at the top.
A note on the implementation: Derrick rightly pointed out[1] that
we're bending over backwards here in get_short_oid() to first
de-duplicate the list, and then emit it, but could simply do it in one
step.
The reason for that is that oid_array_for_each_unique() doesn't
actually require that the array be sorted by oid_array_sort(), it just
needs to be sorted in some order that guarantees that all objects with
the same ID are adjacent to one another, which (barring a hash
collision, which'll be someone else's problem) the sort_ambiguous()
function does.
I agree that would be simpler for this code, and had forgotten why I
initially wrote it like this[2]. But on further reflection I think
it's better to do more work here just so we're not underhandedly using
the oid-array API where we lie about the list being sorted. That would
break any subsequent use of oid_array_lookup() in subtle ways.
I could get around that by hacking the API itself to support this
use-case and documenting it, which I did as a WIP patch in [3], but I
think it's too much code smell just for this one call site. It's
simpler for the API to just introduce a oid_array_for_each() function
to eagerly spew out the list without sorting or de-duplication, and
then do the de-duplication and sorting in two passes.
1. https://public-inbox.org/git/20180501130318.58251-1-dstolee@microsoft.com/
2. https://public-inbox.org/git/876047ze9v.fsf@evledraar.gmail.com/
3. https://public-inbox.org/git/874ljrzctc.fsf@evledraar.gmail.com/
Helped-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
80 lines
1.5 KiB
C
80 lines
1.5 KiB
C
#include "cache.h"
|
|
#include "sha1-array.h"
|
|
#include "sha1-lookup.h"
|
|
|
|
void oid_array_append(struct oid_array *array, const struct object_id *oid)
|
|
{
|
|
ALLOC_GROW(array->oid, array->nr + 1, array->alloc);
|
|
oidcpy(&array->oid[array->nr++], oid);
|
|
array->sorted = 0;
|
|
}
|
|
|
|
static int void_hashcmp(const void *a, const void *b)
|
|
{
|
|
return oidcmp(a, b);
|
|
}
|
|
|
|
static void oid_array_sort(struct oid_array *array)
|
|
{
|
|
QSORT(array->oid, array->nr, void_hashcmp);
|
|
array->sorted = 1;
|
|
}
|
|
|
|
static const unsigned char *sha1_access(size_t index, void *table)
|
|
{
|
|
struct object_id *array = table;
|
|
return array[index].hash;
|
|
}
|
|
|
|
int oid_array_lookup(struct oid_array *array, const struct object_id *oid)
|
|
{
|
|
if (!array->sorted)
|
|
oid_array_sort(array);
|
|
return sha1_pos(oid->hash, array->oid, array->nr, sha1_access);
|
|
}
|
|
|
|
void oid_array_clear(struct oid_array *array)
|
|
{
|
|
FREE_AND_NULL(array->oid);
|
|
array->nr = 0;
|
|
array->alloc = 0;
|
|
array->sorted = 0;
|
|
}
|
|
|
|
|
|
int oid_array_for_each(struct oid_array *array,
|
|
for_each_oid_fn fn,
|
|
void *data)
|
|
{
|
|
int i;
|
|
|
|
/* No oid_array_sort() here! See the api-oid-array.txt docs! */
|
|
|
|
for (i = 0; i < array->nr; i++) {
|
|
int ret = fn(array->oid + i, data);
|
|
if (ret)
|
|
return ret;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int oid_array_for_each_unique(struct oid_array *array,
|
|
for_each_oid_fn fn,
|
|
void *data)
|
|
{
|
|
int i;
|
|
|
|
if (!array->sorted)
|
|
oid_array_sort(array);
|
|
|
|
for (i = 0; i < array->nr; i++) {
|
|
int ret;
|
|
if (i > 0 && !oidcmp(array->oid + i, array->oid + i - 1))
|
|
continue;
|
|
ret = fn(array->oid + i, data);
|
|
if (ret)
|
|
return ret;
|
|
}
|
|
return 0;
|
|
}
|