From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Subject: [PATCH 3/3] get_sha1: support ref^{/regex} syntax Date: Mon, 13 Dec 2010 10:01:15 +0700 Message-ID: <1292209275-17451-3-git-send-email-pclouds@gmail.com> References: <1292209275-17451-1-git-send-email-pclouds@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Kevin Ballard , Yann Dirson , Jeff King , Jakub Narebski , Thiago Farina , =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= To: git@vger.kernel.org, Junio C Hamano , Jonathan Niedier X-From: git-owner@vger.kernel.org Mon Dec 13 04:02:39 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PRygP-0008Kz-0B for gcvg-git-2@lo.gmane.org; Mon, 13 Dec 2010 04:02:37 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756673Ab0LMDCa convert rfc822-to-quoted-printable (ORCPT ); Sun, 12 Dec 2010 22:02:30 -0500 Received: from mail-pv0-f174.google.com ([74.125.83.174]:53020 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754844Ab0LMDC3 (ORCPT ); Sun, 12 Dec 2010 22:02:29 -0500 Received: by mail-pv0-f174.google.com with SMTP id 4so1041839pva.19 for ; Sun, 12 Dec 2010 19:02:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references:mime-version :content-type:content-transfer-encoding; bh=1VEoxg2klNq0uBHElSlWHHGOSzdd/tno+jMq2q5SOew=; b=C1rFFNGbO3CLkiVHE3SKQEMDz1UtbvuwSxYAGCcD2L3pnhYoB7AqfTgd37DXZJEnih 1IRw5PqGo7hLLURP+a3OIsYNQ/3nYYzooStscKnXlOMm9egW30nz3DLNKGxQgL2qNI4J f03/Jok+n15cPYy01fTNVGVUVHyzzvG0FhY5g= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; b=RfA5AddTl+z2bQy19cJxGpbpMOEELTUQfnY5ktEXej49nj8n+0hrcWLRTK7kWQihp/ r0gvPXacbFVkmsYRr2/4+Yl4YN6Qx8hV1J9AWIObIae0YUhKCW8v8BgWlOXHlqjksrBz kDt/TKZ/ftjitucpFOGmLBM9Vg520p3ffVcr4= Received: by 10.142.150.13 with SMTP id x13mr2760257wfd.407.1292209349131; Sun, 12 Dec 2010 19:02:29 -0800 (PST) Received: from pclouds@gmail.com ([115.73.222.178]) by mx.google.com with ESMTPS id x18sm8273042wfa.11.2010.12.12.19.02.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 12 Dec 2010 19:02:28 -0800 (PST) Received: by pclouds@gmail.com (sSMTP sendmail emulation); Mon, 13 Dec 2010 10:01:34 +0700 X-Mailer: git-send-email 1.7.3.3.476.g10a82 In-Reply-To: <1292209275-17451-1-git-send-email-pclouds@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This works like :/ syntax, but only limited to one ref. Signed-off-by: Nguy=E1=BB=85n Th=C3=A1i Ng=E1=BB=8Dc Duy --- Documentation/revisions.txt | 6 +++ sha1_name.c | 34 +++++++++++++------ t/t1511-rev-parse-caret.sh | 73 +++++++++++++++++++++++++++++++++++= ++++++++ 3 files changed, 102 insertions(+), 11 deletions(-) create mode 100755 t/t1511-rev-parse-caret.sh diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index 3d4b79c..174fa8e 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -106,6 +106,12 @@ the `$GIT_DIR/refs` directory or from the `$GIT_DI= R/packed-refs` file. and dereference the tag recursively until a non-tag object is found. =20 +* A suffix '{caret}' to a revision parameter followed by a brace + pair that contains a text led by a slash (e.g. `HEAD^{/fix nasty bug= }`): + this is the same as `:/fix nasty bug` syntax below except that + it returns the youngest matching commit which is reachable from + the ref before '{caret}'. + * A colon, followed by a slash, followed by a text (e.g. `:/fix nasty = bug`): this names a commit whose commit message matches the specified regular expressi= on. This name returns the youngest matching commit which is diff --git a/sha1_name.c b/sha1_name.c index 3c2c61c..a7e1bcb 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -529,6 +529,7 @@ struct object *peel_to_type(const char *name, int n= amelen, } } =20 +static int get_sha1_oneline(const char *, unsigned char *, struct comm= it_list *); static int peel_onion(const char *name, int len, unsigned char *sha1) { unsigned char outer[20]; @@ -564,6 +565,8 @@ static int peel_onion(const char *name, int len, un= signed char *sha1) expected_type =3D OBJ_BLOB; else if (sp[0] =3D=3D '}') expected_type =3D OBJ_NONE; + else if (sp[0] =3D=3D '/') + expected_type =3D OBJ_COMMIT; else return -1; =20 @@ -578,19 +581,28 @@ static int peel_onion(const char *name, int len, = unsigned char *sha1) if (!o || (!o->parsed && !parse_object(o->sha1))) return -1; hashcpy(sha1, o->sha1); + return 0; } - else { - /* - * At this point, the syntax look correct, so - * if we do not get the needed object, we should - * barf. - */ - o =3D peel_to_type(name, len, o, expected_type); - if (o) { - hashcpy(sha1, o->sha1); - return 0; - } + + /* + * At this point, the syntax look correct, so if we do not get + * the needed object, we should barf. + */ + o =3D peel_to_type(name, len, o, expected_type); + if (!o) return -1; + + hashcpy(sha1, o->sha1); + if (sp[0] =3D=3D '/') { /* ^{/foo} */ + struct commit_list *list =3D NULL; + char *prefix; + int ret; + + commit_list_insert((struct commit *)o, &list); + prefix =3D xstrndup(sp + 1, name + len - 1 - (sp + 1)); + ret =3D get_sha1_oneline(prefix, sha1, list); + free(prefix); + return ret; } return 0; } diff --git a/t/t1511-rev-parse-caret.sh b/t/t1511-rev-parse-caret.sh new file mode 100755 index 0000000..5c8439c --- /dev/null +++ b/t/t1511-rev-parse-caret.sh @@ -0,0 +1,73 @@ +#!/bin/sh + +test_description=3D'tests for ref^{stuff}' + +. ./test-lib.sh + +test_expect_success 'setup' ' + echo blob >a-blob && + git tag -a -m blob blob-tag `git hash-object -w a-blob` + mkdir a-tree && + echo moreblobs >a-tree/another-blob && + git add . && + TREE_SHA1=3D`git write-tree` && + git tag -a -m tree tree-tag "$TREE_SHA1" && + git commit -m Initial && + git tag -a -m commit commit-tag && + git branch ref && + git checkout master && + echo modified >>a-blob && + git add -u && + git commit -m Modified +' + +test_expect_success 'ref^{non-existent}' ' + test_must_fail git rev-parse ref^{non-existent} +' + +test_expect_success 'ref^{}' ' + git rev-parse ref >expected && + git rev-parse ref^{} >actual && + test_cmp expected actual && + git rev-parse commit-tag^{} >actual && + test_cmp expected actual +' + +test_expect_success 'ref^{commit}' ' + git rev-parse ref >expected && + git rev-parse ref^{commit} >actual && + test_cmp expected actual && + git rev-parse commit-tag^{commit} >actual && + test_cmp expected actual && + test_must_fail git rev-parse tree-tag^{commit} && + test_must_fail git rev-parse blob-tag^{commit} +' + +test_expect_success 'ref^{tree}' ' + echo $TREE_SHA1 >expected && + git rev-parse ref^{tree} >actual && + test_cmp expected actual && + git rev-parse commit-tag^{tree} >actual && + test_cmp expected actual && + git rev-parse tree-tag^{tree} >actual && + test_cmp expected actual && + test_must_fail git rev-parse blob-tag^{tree} +' + +test_expect_success 'ref^{/}' ' + git rev-parse master >expected && + git rev-parse master^{/} >actual && + test_cmp expected actual +' + +test_expect_success 'ref^{/non-existent}' ' + test_must_fail git rev-parse master^{/non-existent} +' + +test_expect_success 'ref^{/Initial}' ' + git rev-parse ref >expected && + git rev-parse master^{/Initial} >actual && + test_cmp expected actual +' + +test_done --=20 1.7.3.3.476.g10a82