@matheusbsbs / matheus-bagliano / commits / 5cc044e025

get_short_oid: sort ambiguous objects by type, then SHA-1

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>

Ævar Arnfjörð Bjarmason committed May 10, 2018 at 12:43 UTC 5cc044e02571e93048160d94e64fe6d8dd96597e

5 files changed +88 -7

Documentation/technical/api-oid-array.txt

+11 -6

@@ -35,13 +35,18 @@ Functions

35 Free all memory associated with the array and return it to the

36 initial, empty state.

38 +`oid_array_for_each`::

39 + Iterate over each element of the list, executing the callback

40 + function for each one. Does not sort the list, so any custom

41 + hash order is retained. If the callback returns a non-zero

42 + value, the iteration ends immediately and the callback's

43 + return is propagated; otherwise, 0 is returned.

44 +

45 `oid_array_for_each_unique`::

39 - Efficiently iterate over each unique element of the list,

40 - executing the callback function for each one. If the array is

41 - not sorted, this function has the side effect of sorting it. If

42 - the callback returns a non-zero value, the iteration ends

43 - immediately and the callback's return is propagated; otherwise,

44 - 0 is returned.

46 + Iterate over each unique element of the list in sorted order,

47 + but otherwise behave like `oid_array_for_each`. If the array

48 + is not sorted, this function has the side effect of sorting

49 + it.

51 Examples

52 --------

sha1-array.c

+17

@@ -41,6 +41,23 @@ void oid_array_clear(struct oid_array *array)

41 array->sorted = 0;

42 }

44 +

45 +int oid_array_for_each(struct oid_array *array,

46 + for_each_oid_fn fn,

47 + void *data)

48 +{

49 + int i;

50 +

51 + /* No oid_array_sort() here! See the api-oid-array.txt docs! */

52 +

53 + for (i = 0; i < array->nr; i++) {

54 + int ret = fn(array->oid + i, data);

55 + if (ret)

56 + return ret;

57 + }

58 + return 0;

59 +}

60 +

61 int oid_array_for_each_unique(struct oid_array *array,

62 for_each_oid_fn fn,

63 void *data)

sha1-array.h

@@ -16,6 +16,9 @@ void oid_array_clear(struct oid_array *array);

17 typedef int (*for_each_oid_fn)(const struct object_id *oid,

18 void *data);

19 +int oid_array_for_each(struct oid_array *array,

20 + for_each_oid_fn fn,

21 + void *data);

22 int oid_array_for_each_unique(struct oid_array *array,

23 for_each_oid_fn fn,

24 void *data);

sha1-name.c

+36 -1

@@ -378,6 +378,34 @@ static int collect_ambiguous(const struct object_id *oid, void *data)

378 return 0;

379 }

380

381 +static int sort_ambiguous(const void *a, const void *b)

382 +{

383 + int a_type = oid_object_info(a, NULL);

384 + int b_type = oid_object_info(b, NULL);

385 + int a_type_sort;

386 + int b_type_sort;

387 +

388 + /*

389 + * Sorts by hash within the same object type, just as

390 + * oid_array_for_each_unique() would do.

391 + */

392 + if (a_type == b_type)

393 + return oidcmp(a, b);

394 +

395 + /*

396 + * Between object types show tags, then commits, and finally

397 + * trees and blobs.

398 + *

399 + * The object_type enum is commit, tree, blob, tag, but we

400 + * want tag, commit, tree blob. Cleverly (perhaps too

401 + * cleverly) do that with modulus, since the enum assigns 1 to

402 + * commit, so tag becomes 0.

403 + */

404 + a_type_sort = a_type % 4;

405 + b_type_sort = b_type % 4;

406 + return a_type_sort > b_type_sort ? 1 : -1;

407 +}

408 +

409 static int get_short_oid(const char *name, int len, struct object_id *oid,

410 unsigned flags)

411 {

@@ -409,6 +437,8 @@ static int get_short_oid(const char *name, int len, struct object_id *oid,

437 status = finish_object_disambiguation(&ds, oid);

438

439 if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {

440 + struct oid_array collect = OID_ARRAY_INIT;

441 +

442 error(_("short SHA1 %s is ambiguous"), ds.hex_pfx);

443

444 /*

@@ -421,7 +451,12 @@ static int get_short_oid(const char *name, int len, struct object_id *oid,

451 ds.fn = NULL;

452

453 advise(_("The candidates are:"));

424 - for_each_abbrev(ds.hex_pfx, show_ambiguous_object, &ds);

454 + for_each_abbrev(ds.hex_pfx, collect_ambiguous, &collect);

455 + QSORT(collect.oid, collect.nr, sort_ambiguous);

456 +

457 + if (oid_array_for_each(&collect, show_ambiguous_object, &ds))

458 + BUG("show_ambiguous_object shouldn't return non-zero");

459 + oid_array_clear(&collect);

460 }

461

462 return status;

t/t1512-rev-parse-disambiguation.sh

+21

@@ -361,4 +361,25 @@ test_expect_success 'core.disambiguate does not override context' '

361 git -c core.disambiguate=committish rev-parse $sha1^{tree}

362 '

363

364 +test_expect_success C_LOCALE_OUTPUT 'ambiguous commits are printed by type first, then hash order' '

365 + test_must_fail git rev-parse 0000 2>stderr &&

366 + grep ^hint: stderr >hints &&

367 + grep 0000 hints >objects &&

368 + cat >expected <<-\EOF &&

369 + tag

370 + commit

371 + tree

372 + blob

373 + EOF

374 + awk "{print \$3}" <objects >objects.types &&

375 + uniq <objects.types >objects.types.uniq &&

376 + test_cmp expected objects.types.uniq &&

377 + for type in tag commit tree blob

378 + do

379 + grep $type objects >$type.objects &&

380 + sort $type.objects >$type.objects.sorted &&

381 + test_cmp $type.objects.sorted $type.objects

382 + done

383 +'

384 +

385 test_done