From owner-freebsd-git@freebsd.org Thu Feb 11 10:24:24 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85494542942; Thu, 11 Feb 2021 10:24:24 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: from lb2-smtp-cloud7.xs4all.net (lb2-smtp-cloud7.xs4all.net [194.109.24.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.xs4all.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dbt600PYbz3JQk; Thu, 11 Feb 2021 10:24:23 +0000 (UTC) (envelope-from adridg@freebsd.org) Received: from cust-d4a83f22 ([IPv6:fc0c:c11d:cecc:f58a:eaa1:c0:9d8f:c143]) by smtp-cloud7.xs4all.net with ESMTPA id A992lO5Qz5126A993lItyn; Thu, 11 Feb 2021 11:24:22 +0100 From: Adriaan de Groot To: Graham Perrin , freebsd-git@freebsd.org Cc: freebsd-current , freebsd-git Subject: Re: cgit: orientation Date: Thu, 11 Feb 2021 11:24:16 +0100 Message-ID: <2285106.THHZn3L5Ee@beastie.bionicmutton.org> Organization: FreeBSD In-Reply-To: References: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart3780568.kAAoriTUSa"; micalg="pgp-sha256"; protocol="application/pgp-signature" X-CMAE-Envelope: MS4xfJ63HpeN0lI7GKrk6BzFQI8QWpbOns00DRG+Rri4e+4wp6yUfEN2i7Cdqkb9pQJU36qB7p7UIepNPDz4Dkmf9A7Zg/fYhAZkr7lIrdcWABevTKPyOjN0 A8wy8EYLDabouBQcbS5YGzmgHI//sui/X5LIAnyRub+9Zf/Kydw0duP6uLSvpcl4rUIdlJQLg5wazrZDoBAbzqAlca289k0eEkCeHPUKHxpL9Yf+qHsh/wA7 8M2fWjrpjpXg/mSiI9KJdcEf7e8sIwpf0ZWruB2hCte7aiC+rFPUb+Vt2DIO8SZkOff4PglZolCRras4Nwv/vZilo627XLMx9ElCW3j0RG/stSuM4KtjeAcy OhPWz8Z3tGFXne+OyZQrKDqw3FAXJw== X-Rspamd-Queue-Id: 4Dbt600PYbz3JQk X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:3265, ipnet:194.109.0.0/16, country:NL]; local_wl_from(0.00)[freebsd.org] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Feb 2021 10:24:24 -0000 --nextPart3780568.kAAoriTUSa Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; protected-headers="v1" From: Adriaan de Groot To: Graham Perrin , freebsd-git@freebsd.org Cc: freebsd-current , freebsd-git Subject: Re: cgit: orientation Date: Thu, 11 Feb 2021 11:24:16 +0100 Message-ID: <2285106.THHZn3L5Ee@beastie.bionicmutton.org> Organization: FreeBSD In-Reply-To: References: On Wednesday, 10 February 2021 01:52:32 CET Warner Losh wrote: > On Tue, Feb 9, 2021 at 5:47 PM Graham Perrin wro= te: > > Given this, for example: > >=20 > > < > > https://cgit.freebsd.org/src/commit/?id=3D174a7e578a33c01401e33f9bfcc07= 7fc31 > > 55251c&h=3Dstable%2F12 > >=20 > >=20 > > =E2=80=93 with 'stable' in the URL and 'stable/12' visible in the page = =E2=80=93 how > > would a reader know that the commit was to main (not stable/12)? > >=20 > > Is there scope to make improved use of cgit, or is this a limitation of > > cgit? >=20 > There's a pulldown in the upper right corner that says 'stable/12' though > it took me a while to find it as my eyes glided over it a couple of times. cgit, though, is just not a very featureful history browser. It does the ba= re=20 minimum, but phabricator or gitlab give you a much nicer (although in their= =20 own way slow and/or clunky) history view. Call me old-school, but =2D if you're asking this kind of question, you probably have a checkout al= ready =2D if you have a checkout, you probably have git(1) installed,. too =2D just use the command-line: git branch --contains 174a7e578a git branch -r --contains 174a7e578a The latter tells you what branches all have the named commit in their=20 ancestry. You could add a git alias: git config --global alias.what-branch "branch -r --contains" and then you can do git what-branch 174a7e578a Buut, yeah, cgit. If you happen to hit a commit at the tip of a branch,=20 there's some decoration but the combination of id and branch in the URL can= be=20 complete nonsense, e.g. https://cgit.freebsd.org/src/commit/? id=3Da7c68340584c942792188ad50593d4ef15cc8982&h=3Dreleng%2F5.5 will give you Warner's latest ACPI commit for EPYC, from which you can=20 conclude it was in 5.5-RELEASE :| [ade] --nextPart3780568.kAAoriTUSa Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- iQGzBAABCAAdFiEEhrjttu2OP5apuuy1z93JbxKxkVwFAmAlBdAACgkQz93JbxKx kVzCyAv9HxSFaX3O4hd5eYXo6jFCN4N0Ts7sIwoyekaiHOEfJZSk6r81Ligavu3Z JyzcRzgPW694Y53CeuR2StvBdCAEwsbPeuHS0+to9DYPSEqai+xFVbxQ6rmAK0jB ON3hhM5bXQogOJtuqoUdqKk8mrf+ZmwogJ01v1I+I/jY9Yc4aS0930Z1RFFDgVBh r6l0pSscw5Nmr+pRA9nfwtXghvqvJNJaBsOkmqqwAeXjYo3JJC2Xyq9cgKaznrz7 QQyxXJKuJiw5rwPsQ+oqxAdK1VOH4BQgPTYpVJsy2Hx6ZMRLl/8fmWmGaBYEKK3y aIUa0nTsEyKZYy0bh+pZHdw/XRpNJ6zm09l0cJLwwB/Q2uq1ALN0xU1sZGSJUZty lUCglein0Wne8ILomJ8aWC3s8nDyJ0dTMv11jCpsVojWNz9ryIfkn8oR6lG+2X1E EPA3QhwNEBLUM+DKDX1gWGiOrrw2Q9BQ0cu6Z+JRnJun7ft0+qKv/CfYxMsFCjSq leO+iROz =2V5B -----END PGP SIGNATURE----- --nextPart3780568.kAAoriTUSa--