From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 11B761F404 for ; Wed, 4 Apr 2018 17:12:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752721AbeDDRMN (ORCPT ); Wed, 4 Apr 2018 13:12:13 -0400 Received: from mail-wr0-f173.google.com ([209.85.128.173]:40025 "EHLO mail-wr0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752447AbeDDRML (ORCPT ); Wed, 4 Apr 2018 13:12:11 -0400 Received: by mail-wr0-f173.google.com with SMTP id n2so20579048wrj.7 for ; Wed, 04 Apr 2018 10:12:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F/kaLlJUTs4bMgTt3rf3eoizX1uAkTAEaUzQAZ+us8A=; b=H159RBCQBpOrggKFCSj3HT2s9UQNVAueMkNoxxpXU+oWs6e5ZWQ2YPlffTr/l1+S7y jl21PFlv2vW1vZutEsuQImtM8Rt8t9vL+JbI5fwHqfpkdyQWKSFZ2zgnfY4ATT+DuH7W uJ8hnHgXUaWsaIUYRdyutqFDG6kLGMTwEshnOIm9i8BXehnLG6N2qTWKmoVLeKGQqlJV Qz9pPvAptbTSznsmUNCJsFN8W1mVXtk07HTJQLMCsxSOIq2vsz1XfZw0M03Dd4/ajzQ9 3Iiwqrw8AL4Bso9yK4JS+JDi2W+o7CTCmEBJ4msdXSl/wfpLFsj6OATHfmpbj556Il1E KIvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F/kaLlJUTs4bMgTt3rf3eoizX1uAkTAEaUzQAZ+us8A=; b=nUvzST30hzWoaIFpwtE9cxLxJHNdcgm+M75gH3guCcpsMOpH6Qt7VN2IOWjALbuQOc 5J5r0wVCLttcZTMEwJDqx40n5mkH0E4m8RQzvZXfozJH17ORO3h5y3jlFTYFGowX1IKC dsv72sM/jt/xwodWm/dJ4rRLX4Te+pzvC+XEi+0dwfaab+Yhq72YL4Bc1nlza/X92k2C YXr9NKrnSLE8bNH4AisrGVB0OPzDsinnHawRLeFYHTeMjL9/F6pYjZ1/6uNIc38Fdj4U 8oOzR6cgtxBGcJsn8MVI6krJ2ps0brTxXt6XT3fbSXPYjEDKnjJ7V1li9EAxsogJ4Huk 8PYA== X-Gm-Message-State: ALQs6tAxuh1gZoLNjQJQSRBKfttzq/RWiOKGdaIh+gbEjNm86cDDWmlk 5YWDa6/YM2qMrac9XXSeukoepRgTOLQ= X-Google-Smtp-Source: AIpwx4/4JSAB28ugJYc5AMpwxWez7MMkqnsGG4vwO6WLf6hA9uxh1LweRZDodHAN91lrqjLmssvfPg== X-Received: by 2002:a19:1449:: with SMTP id k70-v6mr12041033lfi.23.1522861930098; Wed, 04 Apr 2018 10:12:10 -0700 (PDT) Received: from localhost.localdomain (c-5eea2375-74736162.cust.telenor.se. [94.234.35.117]) by smtp.gmail.com with ESMTPSA id i18-v6sm1092339lfj.50.2018.04.04.10.12.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Apr 2018 10:12:09 -0700 (PDT) From: Harald Nordgren To: git@vger.kernel.org, avarab@gmail.com, peff@peff.net, gitster@pobox.com, sunshine@sunshineco.com Cc: Harald Nordgren Subject: [PATCH v7] ls-remote: create '--sort' option Date: Wed, 4 Apr 2018 19:11:53 +0200 Message-Id: <20180404171153.4126-1-haraldnordgren@gmail.com> X-Mailer: git-send-email 2.14.3 (Apple Git-98) In-Reply-To: <20180402005248.52418-1-haraldnordgren@gmail.com> References: <20180402005248.52418-1-haraldnordgren@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Create a '--sort' option for ls-remote, based on the one from for-each-ref. This e.g. allows ref names to be sorted by version semantics, so that v1.2 is sorted before v1.10. Signed-off-by: Harald Nordgren --- Notes: Started using 'ALLOC_GROW' Documentation/git-ls-remote.txt | 12 +++++++++++- builtin/ls-remote.c | 27 +++++++++++++++++++++++++-- t/t5512-ls-remote.sh | 41 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 76 insertions(+), 4 deletions(-) diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index 5f2628c8f..17fae7218 100644 --- a/Documentation/git-ls-remote.txt +++ b/Documentation/git-ls-remote.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git ls-remote' [--heads] [--tags] [--refs] [--upload-pack=] - [-q | --quiet] [--exit-code] [--get-url] + [-q | --quiet] [--exit-code] [--get-url] [--sort=] [--symref] [ [...]] DESCRIPTION @@ -60,6 +60,16 @@ OPTIONS upload-pack only shows the symref HEAD, so it will be the only one shown by ls-remote. +--sort=:: + Sort based on the key given. Prefix `-` to sort in + descending order of the value. You may use the --sort= option + multiple times, in which case the last key becomes the primary + key. Also supports "version:refname" or "v:refname" (tag + names are treated as versions). The "version:refname" sort + order can also be affected by the "versionsort.suffix" + configuration variable. + The keys supported are the same as those in `git for-each-ref`. + :: The "remote" repository to query. This parameter can be either a URL or the name of a remote (see the GIT URLS and diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index 540d56429..5bb8ee68a 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -1,6 +1,7 @@ #include "builtin.h" #include "cache.h" #include "transport.h" +#include "ref-filter.h" #include "remote.h" static const char * const ls_remote_usage[] = { @@ -43,10 +44,13 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) int show_symref_target = 0; const char *uploadpack = NULL; const char **pattern = NULL; + int i; struct remote *remote; struct transport *transport; const struct ref *ref; + struct ref_array array; + static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting; struct option options[] = { OPT__QUIET(&quiet, N_("do not print remote URL")), @@ -60,6 +64,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL), OPT_BOOL(0, "get-url", &get_url, N_("take url..insteadOf into account")), + OPT_CALLBACK(0 , "sort", sorting_tail, N_("key"), + N_("field name to sort on"), &parse_opt_ref_sorting), OPT_SET_INT_F(0, "exit-code", &status, N_("exit with exit code 2 if no matching refs are found"), 2, PARSE_OPT_NOCOMPLETE), @@ -68,6 +74,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) OPT_END() }; + memset(&array, 0, sizeof(array)); + argc = parse_options(argc, argv, prefix, options, ls_remote_usage, PARSE_OPT_STOP_AT_NON_OPTION); dest = argv[0]; @@ -104,13 +112,28 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix) if (!dest && !quiet) fprintf(stderr, "From %s\n", *remote->url); for ( ; ref; ref = ref->next) { + struct ref_array_item *item; if (!check_ref_type(ref, flags)) continue; if (!tail_match(pattern, ref->name)) continue; + + FLEX_ALLOC_MEM(item, refname, ref->name, strlen(ref->name)); + item->symref = ref->symref; + item->objectname = ref->old_oid; + + ALLOC_GROW(array.items, array.nr + 1, array.alloc); + array.items[array.nr++] = item; + } + + if (sorting) + ref_array_sort(sorting, &array); + + for (i = 0; i < array.nr; i++) { + const struct ref_array_item *ref = array.items[i]; if (show_symref_target && ref->symref) - printf("ref: %s\t%s\n", ref->symref, ref->name); - printf("%s\t%s\n", oid_to_hex(&ref->old_oid), ref->name); + printf("ref: %s\t%s\n", ref->symref, ref->refname); + printf("%s\t%s\n", oid_to_hex(&ref->objectname), ref->refname); status = 0; /* we found something */ } return status; diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh index 02106c922..66370cd88 100755 --- a/t/t5512-ls-remote.sh +++ b/t/t5512-ls-remote.sh @@ -10,6 +10,9 @@ test_expect_success setup ' test_tick && git commit -m initial && git tag mark && + git tag mark1.1 && + git tag mark1.2 && + git tag mark1.10 && git show-ref --tags -d | sed -e "s/ / /" >expected.tag && ( echo "$(git rev-parse HEAD) HEAD" @@ -39,6 +42,39 @@ test_expect_success 'ls-remote self' ' test_cmp expected.all actual ' +test_expect_success 'ls-remote --sort="version:refname" --tags self' ' + cat >expect <<-\EOF && + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.1 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.2 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.10 + EOF + git ls-remote --sort="version:refname" --tags self >actual && + test_cmp expect actual +' + +test_expect_success 'ls-remote --sort="-version:refname" --tags self' ' + cat >expect <<-\EOF && + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.10 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.2 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.1 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark + EOF + git ls-remote --sort="-version:refname" --tags self >actual && + test_cmp expect actual +' + +test_expect_success 'ls-remote --sort="-refname" --tags self' ' + cat >expect <<-\EOF && + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.2 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.10 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.1 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark + EOF + git ls-remote --sort="-refname" --tags self >actual && + test_cmp expect actual +' + test_expect_success 'dies when no remote specified and no default remotes found' ' test_must_fail git ls-remote ' @@ -131,7 +167,7 @@ test_expect_success 'Report no-match with --exit-code' ' test_expect_success 'Report match with --exit-code' ' git ls-remote --exit-code other.git "refs/tags/*" >actual && - git ls-remote . tags/mark >expect && + git ls-remote . tags/mark* >expect && test_cmp expect actual ' @@ -178,6 +214,9 @@ test_expect_success 'ls-remote --symref' ' 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/remotes/origin/HEAD 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/remotes/origin/master 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.1 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.10 + 1bd44cb9d13204b0fe1958db0082f5028a16eb3a refs/tags/mark1.2 EOF git ls-remote --symref >actual && test_cmp expect actual -- 2.14.3 (Apple Git-98)