Re: [9front] [PATCH] git/query: leave range commits in topological order

[hiro <23hiro@gmail.com>]

calling it a language enlightened me

On 1/23/22, ori@eigenstate.org <ori@eigenstate.org> wrote:
> Quoth Michael Forney <mforney@mforney.org>:
>>
>> This prevents commits from getting reordered incorrectly during rebase
>> or export.
>> ---
>> diff 108d74cb0a8d27e82550d2772ae64fd7748e151d
>> bb59fa1f40b5e5756639480fc08e0f33c7e19019
>> --- a/sys/src/cmd/git/ref.c	Fri Jan  7 02:37:02 2022
>> +++ b/sys/src/cmd/git/ref.c	Sat Jan 22 16:39:21 2022
>> @@ -51,26 +51,6 @@
>>  		ev->p++;
>>  }
>>
>> -int
>> -objdatecmp(void *pa, void *pb)
>> -{
>> -	Object *a, *b;
>> -	int r;
>> -
>> -	a = readobject((*(Object**)pa)->hash);
>> -	b = readobject((*(Object**)pb)->hash);
>> -	assert(a->type == GCommit && b->type == GCommit);
>> -	if(a->commit->mtime == b->commit->mtime)
>> -		r = 0;
>> -	else if(a->commit->mtime < b->commit->mtime)
>> -		r = -1;
>> -	else
>> -		r = 1;
>> -	unref(a);
>> -	unref(b);
>> -	return r;
>> -}
>> -
>>  void
>>  push(Eval *ev, Object *o)
>>  {
>> @@ -406,7 +386,7 @@
>>  range(Eval *ev)
>>  {
>>  	Object *a, *b, *p, *q, **all;
>> -	int nall, *idx, mark;
>> +	int nall, *idx;
>>  	Objset keep, skip;
>>
>>  	b = pop(ev);
>> @@ -424,7 +404,6 @@
>>  	all = nil;
>>  	idx = nil;
>>  	nall = 0;
>> -	mark = ev->nstk;
>>  	osinit(&keep);
>>  	osinit(&skip);
>>  	osadd(&keep, a);
>> @@ -459,7 +438,6 @@
>>  		nall++;
>>  	}
>>  	free(all);
>> -	qsort(ev->stk + mark, ev->nstk - mark, sizeof(Object*), objdatecmp);
>>  	return 0;
>>  error:
>>  	free(all);
>>
>
> looks good; if someone really wants sorted commits,
> the right way to go would be to add a 'sort' operator
> to the query mini-language. something like:
>
> 	git/query a..b @sort
>
> rather than baking it into the range itself.
>
>