From mboxrd@z Thu Jan 1 00:00:00 1970 From: Karthik Nayak Subject: [PATCH v3 04/16] ref-filter: modify "%(objectname:short)" to take length Date: Wed, 30 Mar 2016 15:09:48 +0530 Message-ID: <1459330800-12525-5-git-send-email-Karthik.188@gmail.com> References: <1459330800-12525-1-git-send-email-Karthik.188@gmail.com> Cc: gitster@pobox.com, jacob.keller@gmail.com, Karthik Nayak , Karthik Nayak To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Mar 30 11:40:37 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1alCc7-0001fQ-3w for gcvg-git-2@plane.gmane.org; Wed, 30 Mar 2016 11:40:35 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752134AbcC3JkZ (ORCPT ); Wed, 30 Mar 2016 05:40:25 -0400 Received: from mail-pf0-f180.google.com ([209.85.192.180]:35241 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751960AbcC3JkU (ORCPT ); Wed, 30 Mar 2016 05:40:20 -0400 Received: by mail-pf0-f180.google.com with SMTP id n5so37937139pfn.2 for ; Wed, 30 Mar 2016 02:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tn4wOy1Jq1VkOoamdaG92x1dZ2ZtwqBizXzUbh/9nPQ=; b=x1CbbxPC93QyBwlrXREI4WFaewZ9q+KuhZKh606FPh9PW+ZJOm4xb9P61yZelYbPEK BAEIflhj17/Tqc7eNcEMe7j1dc7VK5ubcLiBUt3coogHDpEvdG4eZ1SADprspt7qbzZw kE9GWQowoURBXhmTZiysPube5u7Fq8zFen+NZ3pwWiWe2iOxDP08RzJNCcGqFp8cexKN vXw/DSykK7jDh+nUfNik53/ltZZQqpq8KgJ3cLn7WrGkKDjiHKLVR/DtqqCGj0hR+PA8 JPAGxwn1v2JW6RpAHYK6C0qjEME3mQyPdfH8b68Jyvz0EVl0nqQW97qX5D7t4EFQqWkx dbAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tn4wOy1Jq1VkOoamdaG92x1dZ2ZtwqBizXzUbh/9nPQ=; b=DyDni29V71PnlvSHXWEVY+qBkzuUptreAKVtlkBK4tHf01Qc1DrZ324FUahCQQQ9XQ 1fHsL4QIXwT6EiGLilYzBD/ivijz0aNbNAoKBciLrwTBIcz9nBw0OrHCQgInXKT09lOU Rw+tioh0ClvTaz9zbloUUxFwfHOYuHdJEzsWFA6DSbHJ7iQrSWieImxyowOO6BKDllbV GM3E/+WIfRlq5DEvpsEO18m/SWXR9QKZLbw9bkcwrwEbtdfN5gzxWWrru3eRVmVRuAvB 1mINSidB7cGoV1vFyrzS880n0o8AGFT0ohmcS8f2zjV1GMd7aedJ1vxkuYxKtcohDQn0 Y6BQ== X-Gm-Message-State: AD7BkJKuBcQgsK8AXnFrXhWqHT6KVnX7LI9Z7bFp8fZRhvvx4GFmhqs/8LfSwxAWmLN1qA== X-Received: by 10.98.18.1 with SMTP id a1mr11556044pfj.39.1459330819081; Wed, 30 Mar 2016 02:40:19 -0700 (PDT) Received: from localhost.localdomain ([106.51.243.45]) by smtp.gmail.com with ESMTPSA id r65sm4402606pfa.27.2016.03.30.02.40.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 02:40:18 -0700 (PDT) X-Google-Original-From: Karthik Nayak X-Mailer: git-send-email 2.7.4 In-Reply-To: <1459330800-12525-1-git-send-email-Karthik.188@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Add support for %(objectname:short=) which would print the abbreviated unique objectname of given length. When no length is specified, the length is 'DEFAULT_ABBREV'. The minimum length is 'MINIMUM_ABBREV'. The length may be exceeded to ensure that the provided object name is unique. Add tests and documentation for the same. Mentored-by: Christian Couder Mentored-by: Matthieu Moy Helped-by: Jacob Keller Signed-off-by: Karthik Nayak --- Documentation/git-for-each-ref.txt | 4 ++++ ref-filter.c | 25 +++++++++++++++++++------ t/t6300-for-each-ref.sh | 10 ++++++++++ 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index e1b1a66..d3223a2 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -107,6 +107,10 @@ objectsize:: objectname:: The object name (aka SHA-1). For a non-ambiguous abbreviation of the object name append `:short`. + For an abbreviation of the object name with desired length append + `:short=`, where the minimum length is MINIMUM_ABBREV. The + length may be exceeded to ensure unique object names. + upstream:: The name of a local ref which can be considered ``upstream'' diff --git a/ref-filter.c b/ref-filter.c index 857a8b5..17f781d 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -55,7 +55,10 @@ static struct used_atom { const char *if_equals, *not_equals; } if_then_else; - enum { O_FULL, O_SHORT } objectname; + struct { + enum { O_FULL, O_LENGTH, O_SHORT } option; + unsigned int length; + } objectname; } u; } *used_atom; static int used_atom_cnt, need_tagged, need_symref; @@ -118,10 +121,17 @@ static void contents_atom_parser(struct used_atom *atom, const char *arg) static void objectname_atom_parser(struct used_atom *atom, const char *arg) { if (!arg) - atom->u.objectname = O_FULL; + atom->u.objectname.option = O_FULL; else if (!strcmp(arg, "short")) - atom->u.objectname = O_SHORT; - else + atom->u.objectname.option = O_SHORT; + else if (skip_prefix(arg, "short=", &arg)) { + atom->u.contents.option = O_LENGTH; + if (strtoul_ui(arg, 10, &atom->u.objectname.length) || + atom->u.objectname.length == 0) + die(_("positive value expected objectname:short=%s"), arg); + if (atom->u.objectname.length < MINIMUM_ABBREV) + atom->u.objectname.length = MINIMUM_ABBREV; + } else die(_("unrecognized %%(objectname) argument: %s"), arg); } @@ -591,12 +601,15 @@ static int grab_objectname(const char *name, const unsigned char *sha1, struct atom_value *v, struct used_atom *atom) { if (starts_with(name, "objectname")) { - if (atom->u.objectname == O_SHORT) { + if (atom->u.objectname.option == O_SHORT) { v->s = xstrdup(find_unique_abbrev(sha1, DEFAULT_ABBREV)); return 1; - } else if (atom->u.objectname == O_FULL) { + } else if (atom->u.objectname.option == O_FULL) { v->s = xstrdup(sha1_to_hex(sha1)); return 1; + } else if (atom->u.objectname.option == O_LENGTH) { + v->s = xstrdup(find_unique_abbrev(sha1, atom->u.objectname.length)); + return 1; } else die("BUG: unknown %%(objectname) option"); } diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 19a2823..2be0a3f 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -60,6 +60,8 @@ test_atom head objecttype commit test_atom head objectsize 171 test_atom head objectname $(git rev-parse refs/heads/master) test_atom head objectname:short $(git rev-parse --short refs/heads/master) +test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master) +test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master) test_atom head tree $(git rev-parse refs/heads/master^{tree}) test_atom head parent '' test_atom head numparent 0 @@ -99,6 +101,8 @@ test_atom tag objecttype tag test_atom tag objectsize 154 test_atom tag objectname $(git rev-parse refs/tags/testtag) test_atom tag objectname:short $(git rev-parse --short refs/tags/testtag) +test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master) +test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master) test_atom tag tree '' test_atom tag parent '' test_atom tag numparent '' @@ -164,6 +168,12 @@ test_expect_success 'Check invalid format specifiers are errors' ' test_must_fail git for-each-ref --format="%(authordate:INVALID)" refs/heads ' +test_expect_success 'arguments to %(objectname:short=) must be positive integers' ' + test_must_fail git for-each-ref --format="%(objectname:short=0)" && + test_must_fail git for-each-ref --format="%(objectname:short=-1)" && + test_must_fail git for-each-ref --format="%(objectname:short=foo)" +' + test_date () { f=$1 && committer_date=$2 && -- 2.7.4