From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 May 2018 06:59:29 +0000 (+0900)
Subject: Merge branch 'hn/sort-ls-remote'
X-Git-Tag: v2.18.0-rc0~85
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6c0110ff0648ad1f8eb97edb7f43039c8c47f29f?hp=-c

Merge branch 'hn/sort-ls-remote'

"git ls-remote" learned an option to allow sorting its output based
on the refnames being shown.

* hn/sort-ls-remote:
ls-remote: create '--sort' option
---

6c0110ff0648ad1f8eb97edb7f43039c8c47f29f
diff --combined builtin/ls-remote.c
index 380c180270,d3851074c2..ca3f04a839
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@@ -1,8 -1,8 +1,9 @@@
  #include "builtin.h"
  #include "cache.h"
  #include "transport.h"
+ #include "ref-filter.h"
  #include "remote.h"
 +#include "refs.h"
  
  static const char * const ls_remote_usage[] = {
  	N_("git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@@ -44,11 -44,13 +45,14 @@@ int cmd_ls_remote(int argc, const char 
  	int show_symref_target = 0;
  	const char *uploadpack = NULL;
  	const char **pattern = NULL;
 +	struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
+ 	int i;
  
  	struct remote *remote;
  	struct transport *transport;
  	const struct ref *ref;
+ 	struct ref_array ref_array;
+ 	static struct ref_sorting *sorting = NULL, **sorting_tail = &sorting;
  
  	struct option options[] = {
  		OPT__QUIET(&quiet, N_("do not print remote URL")),
@@@ -62,6 -64,8 +66,8 @@@
  		OPT_BIT(0, "refs", &flags, N_("do not show peeled tags"), REF_NORMAL),
  		OPT_BOOL(0, "get-url", &get_url,
  			 N_("take url.<base>.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),
@@@ -70,6 -74,8 +76,8 @@@
  		OPT_END()
  	};
  
+ 	memset(&ref_array, 0, sizeof(ref_array));
+ 
  	argc = parse_options(argc, argv, prefix, options, ls_remote_usage,
  			     PARSE_OPT_STOP_AT_NON_OPTION);
  	dest = argv[0];
@@@ -77,17 -83,8 +85,17 @@@
  	if (argc > 1) {
  		int i;
  		pattern = xcalloc(argc, sizeof(const char *));
 -		for (i = 1; i < argc; i++)
 +		for (i = 1; i < argc; i++) {
 +			const char *glob;
  			pattern[i - 1] = xstrfmt("*/%s", argv[i]);
 +
 +			glob = strchr(argv[i], '*');
 +			if (glob)
 +				argv_array_pushf(&ref_prefixes, "%.*s",
 +						 (int)(glob - argv[i]), argv[i]);
 +			else
 +				expand_ref_prefix(&ref_prefixes, argv[i]);
 +		}
  	}
  
  	remote = remote_get(dest);
@@@ -101,6 -98,7 +109,7 @@@
  
  	if (get_url) {
  		printf("%s\n", *remote->url);
+ 		UNLEAK(sorting);
  		return 0;
  	}
  
@@@ -108,21 -106,36 +117,36 @@@
  	if (uploadpack != NULL)
  		transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
  
 -	ref = transport_get_remote_refs(transport);
 +	ref = transport_get_remote_refs(transport, &ref_prefixes);
- 	if (transport_disconnect(transport))
+ 	if (transport_disconnect(transport)) {
+ 		UNLEAK(sorting);
  		return 1;
+ 	}
  
  	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;
+ 		item = ref_array_push(&ref_array, ref->name, &ref->old_oid);
+ 		item->symref = xstrdup_or_null(ref->symref);
+ 	}
+ 
+ 	if (sorting)
+ 		ref_array_sort(sorting, &ref_array);
+ 
+ 	for (i = 0; i < ref_array.nr; i++) {
+ 		const struct ref_array_item *ref = 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 */
  	}
+ 
+ 	UNLEAK(sorting);
+ 	UNLEAK(ref_array);
  	return status;
  }