From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=1.0 required=5.0 tests=DATE_IN_PAST_03_06,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=no autolearn_force=no version=3.4.4 Received: (qmail 10028 invoked from network); 23 Jan 2022 19:46:57 -0000 Received: from 4ess.inri.net (216.126.196.42) by inbox.vuxu.org with ESMTPUTF8; 23 Jan 2022 19:46:57 -0000 Received: from mail-qv1-f44.google.com ([209.85.219.44]) by 4ess; Sun Jan 23 14:39:23 -0500 2022 Received: by mail-qv1-f44.google.com with SMTP id k9so18228080qvv.9 for <9front@9front.org>; Sun, 23 Jan 2022 11:39:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=zCp4/7EQiJt9IGd2b/DNrklPVRjh3qE2j+MON9PHabg=; b=Fwczpf66k/70oBAUu1JP00W5DMEkgj3xmHXSP7Yc++yPuhSCgcicCqbp+E/ID8mTBE hwPkhBA0DD1S8AAZuK7AgTo2PYQMt7+C3TNVeo9TGzw9Z+SAt4ZXQMTpYse/9nbq7aM6 xAvxFdFDFpZzKc9wVSzOyQnkU96JBpINRIOSsCVEZuaEAsKatlVP/axFtdFGvLYQEOYY z/rcHmIjaCCsXdKDYbEQMelufpgGm+ahSiXYuyFa11B3bUkeyhytbiPSFDbkoJ4EPTPY g2/K/Xb0JxRadr029/c46yvAveFxSd90cALZ1xj0Mou93ksQhrXODzh3IrCME4+xs0RO apCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=zCp4/7EQiJt9IGd2b/DNrklPVRjh3qE2j+MON9PHabg=; b=GMXfTSCdEerZ0PSgtZYcgcx7cfgRtCdFF8Zfx1tmWbmX75a6ymAwSFo/wyhA0XwpRd DAz4Xjg4zY71I68kF9AQ1WP57Ga0HU78W39vfs1TW3JGEc/0ZmFPq9KFVS+kx1cuGn3P P9F6N1VcA9nECqsYlm/hVMiACKSsnjbm5iw6e3Yry6n7AdqaHPx82Nq59vviqQGR8HLa XyWwttVcZErbIY0Bvp1NkUUwoqy/wCj0via5x681p+2yqWNY2SXZ0ZckgNxq/VtNWr0T AIQpibeMe9N4LKqEagnBWc6ndtJXE2KWINicNRuTaa8Fo8KsX/AsEbev5/PJsDojkl8G MpcQ== X-Gm-Message-State: AOAM533mk2/yvH6s8x0GAeslz9OPP4WN2Updf1BCmIP3s2PW45oSWhvS a4ifxNZUBwSU6G4ArQs2woQHppFy33zxmQT53p9muefpwLM= X-Google-Smtp-Source: ABdhPJwbx1HeFHzbn/DfxX3/msVjmzGeB9Bo5WlmIBOrk2pAXyQnfkQ7ZsUWZoHA6hMfzO6v2isguJGm2bCk8PVrc10= X-Received: by 2002:a05:6102:c89:: with SMTP id f9mr4594535vst.54.1642951788209; Sun, 23 Jan 2022 07:29:48 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a59:ca31:0:b0:27d:32f:72ac with HTTP; Sun, 23 Jan 2022 07:29:47 -0800 (PST) In-Reply-To: <5BB1B8C66C44E67C7BF8E8F9BC683595@eigenstate.org> References: <81393E6026E97B03CBD1F42837BCCE28@arrow> <5BB1B8C66C44E67C7BF8E8F9BC683595@eigenstate.org> From: hiro <23hiro@gmail.com> Date: Sun, 23 Jan 2022 16:29:47 +0100 Message-ID: To: 9front@9front.org Content-Type: text/plain; charset="UTF-8" List-ID: <9front.9front.org> List-Help: X-Glyph: ➈ X-Bullshit: encrypted metadata enhancement-scale self-signing controller Subject: Re: [9front] [PATCH] git/query: leave range commits in topological order Reply-To: 9front@9front.org Precedence: bulk calling it a language enlightened me On 1/23/22, ori@eigenstate.org wrote: > Quoth Michael Forney : >> >> 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. > >