Date: Mon, 15 Jan 2024 19:35:36 -0700 From: Warner Losh <imp@bsdimp.com> To: John Baldwin <jhb@freebsd.org> Cc: Warner Losh <imp@freebsd.org>, src-committers <src-committers@freebsd.org>, "<dev-commits-src-all@freebsd.org>" <dev-commits-src-all@freebsd.org>, "<dev-commits-src-main@freebsd.org>" <dev-commits-src-main@freebsd.org> Subject: Re: git: df834e06bbc7 - main - git-arc: Just strip escape sequences form arc log Message-ID: <CANCZdfpSQhtWmn1_SC6-3D0ReTJh_J2Fu4JCVORMK5SubrgGuA@mail.gmail.com> In-Reply-To: <046cef05-668a-4ee9-a72a-09d7de303a46@FreeBSD.org> References: <202401150224.40F2OSBS093537@gitrepo.freebsd.org> <de314243-7cac-4f1c-b013-5c6c8cadd0bc@FreeBSD.org> <CANCZdfoNWuX%2BG6gTjGPRugyCxNkGH=wZ1kUF4z93mEQ1qmXxmw@mail.gmail.com> <CANCZdfqdv-e7UsWEV99p0hLuxesPpmOyfs4WyJ9QekiaVzc=ew@mail.gmail.com> <046cef05-668a-4ee9-a72a-09d7de303a46@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On Mon, Jan 15, 2024, 4:39 PM John Baldwin <jhb@freebsd.org> wrote: > On 1/15/24 9:02 AM, Warner Losh wrote: > > Hey John, > > > > On Mon, Jan 15, 2024 at 9:37 AM Warner Losh <imp@bsdimp.com> wrote: > > > >> > >> > >> On Mon, Jan 15, 2024 at 9:30 AM John Baldwin <jhb@freebsd.org> wrote: > >> > >>> On 1/14/24 6:24 PM, Warner Losh wrote: > >>>> The branch main has been updated by imp: > >>>> > >>>> URL: > >>> > https://cgit.FreeBSD.org/src/commit/?id=df834e06bbc78c03cb6b35f074ae43673c9ce463 > >>>> > >>>> commit df834e06bbc78c03cb6b35f074ae43673c9ce463 > >>>> Author: Warner Losh <imp@FreeBSD.org> > >>>> AuthorDate: 2024-01-15 02:22:04 +0000 > >>>> Commit: Warner Losh <imp@FreeBSD.org> > >>>> CommitDate: 2024-01-15 02:23:45 +0000 > >>>> > >>>> git-arc: Just strip escape sequences form arc log > >>>> > >>>> Just strip escape sequences and Warning: lines from 'arc list' > >>> output. I > >>>> upgraded and they changed and git arc list broke. This restores > its > >>>> functionality. > >>>> > >>>> Note: jhb didn't like this, so if others object, I'll fix... > >>>> > >>>> Sponsored by: Netflix > >>>> Reviewed by: markj > >>>> Differential Revision: https://reviews.freebsd.org/D36553 > >>> > >>> Namely, it breaks the color output for reviews in different states, so > >>> Needs Review > >>> shows up as purple, Approved as green, etc. If you find the color > output > >>> useful > >>> you'll have to revert this locally. > >>> > >>> Also, your last update in the review said that git arc was no longer > >>> broken for you > >>> back in May implying this commit wasn't needed for git arc to work for > >>> you? > >>> > >> > >> Yes and no. I was mistaken. This change is still needed, but its scope > can > >> be reduced. > >> The trouble is that it's at the first for the other things I committed > and > >> getting it out of the > >> way was a pain (I tried). Since I didn't want to delay things any > further, > >> I went ahead and > >> committed and thought I'd fix stuff if there were objections.I'll do > that > >> now. > >> > > > > So even w/o my change, I don't see the color output for the review states > > (so I can remove the > > general filter I added for color). That's easy enough. but what are you > > doing to get color in the > > current setup? Or is your arcanist install old and un-updated? > > Nope, built locally via poudriere back in October on 14-stable: > > > pkg info | grep arcan > arcanist-lib-php81-20220518_5 Libraries for the command line interface > for Phabricator > arcanist-php81-20220518_5 Command line interface for Phabricator > > > ll /usr/local/poudriere/data/logs/bulk/14_0-20231022-ports/*/arcanist* > -rw-r--r-- 3 root wheel 16185 Oct 22 22:34 > /usr/local/poudriere/data/logs/bulk/14_0-20231022-ports/latest-per-pkg/arcanist-lib-php81-20220518_5.log > -rw-r--r-- 3 root wheel 14152 Oct 22 22:56 > /usr/local/poudriere/data/logs/bulk/14_0-20231022-ports/latest-per-pkg/arcanist-php81-20220518_5.log > > Can't show color arc list output via text e-mail, but it's color, and > git arc list is still color for me (from commit > 613aaf59afa307fc77c8eed01962a59423b1c5f3). > > arc list | more shows all the escape codes, but arc list | less -R > shows the colors just fine. This is in konsole with TERM=xterm256-color. > It also works fine for me in plain xterm under i3wm on my X1 carbon > running main from September with arcanist built in September. > I've had to add --ansi to get color in pipelines... I'm using: the same version of arc too: % arc version arcanist-lib-php80 20220518_5 (devel/arcanist-lib) and 'arc list' into a pipe never gives me color, but 'arc list --ansi' always does. Though there's also arc list --noansi that would be easier than filtering the escape sequences. In any event, I've posted a review https://reviews.freebsd.org/D43459 that should do the right thing. Warner Warner -- > John Baldwin > > [-- Attachment #2 --] <div dir="ltr"><div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Jan 15, 2024, 4:39 PM John Baldwin <<a href="mailto:jhb@freebsd.org" target="_blank">jhb@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On 1/15/24 9:02 AM, Warner Losh wrote:<br> > Hey John,<br> > <br> > On Mon, Jan 15, 2024 at 9:37 AM Warner Losh <<a href="mailto:imp@bsdimp.com" rel="noreferrer" target="_blank">imp@bsdimp.com</a>> wrote:<br> > <br> >><br> >><br> >> On Mon, Jan 15, 2024 at 9:30 AM John Baldwin <<a href="mailto:jhb@freebsd.org" rel="noreferrer" target="_blank">jhb@freebsd.org</a>> wrote:<br> >><br> >>> On 1/14/24 6:24 PM, Warner Losh wrote:<br> >>>> The branch main has been updated by imp:<br> >>>><br> >>>> URL:<br> >>> <a href="https://cgit.FreeBSD.org/src/commit/?id=df834e06bbc78c03cb6b35f074ae43673c9ce463" rel="noreferrer noreferrer" target="_blank">https://cgit.FreeBSD.org/src/commit/?id=df834e06bbc78c03cb6b35f074ae43673c9ce463</a><br>; >>>><br> >>>> commit df834e06bbc78c03cb6b35f074ae43673c9ce463<br> >>>> Author: Warner Losh <imp@FreeBSD.org><br> >>>> AuthorDate: 2024-01-15 02:22:04 +0000<br> >>>> Commit: Warner Losh <imp@FreeBSD.org><br> >>>> CommitDate: 2024-01-15 02:23:45 +0000<br> >>>><br> >>>> git-arc: Just strip escape sequences form arc log<br> >>>><br> >>>> Just strip escape sequences and Warning: lines from 'arc list'<br> >>> output. I<br> >>>> upgraded and they changed and git arc list broke. This restores its<br> >>>> functionality.<br> >>>><br> >>>> Note: jhb didn't like this, so if others object, I'll fix...<br> >>>><br> >>>> Sponsored by: Netflix<br> >>>> Reviewed by: markj<br> >>>> Differential Revision: <a href="https://reviews.freebsd.org/D36553" rel="noreferrer noreferrer" target="_blank">https://reviews.freebsd.org/D36553</a><br>; >>><br> >>> Namely, it breaks the color output for reviews in different states, so<br> >>> Needs Review<br> >>> shows up as purple, Approved as green, etc. If you find the color output<br> >>> useful<br> >>> you'll have to revert this locally.<br> >>><br> >>> Also, your last update in the review said that git arc was no longer<br> >>> broken for you<br> >>> back in May implying this commit wasn't needed for git arc to work for<br> >>> you?<br> >>><br> >><br> >> Yes and no. I was mistaken. This change is still needed, but its scope can<br> >> be reduced.<br> >> The trouble is that it's at the first for the other things I committed and<br> >> getting it out of the<br> >> way was a pain (I tried). Since I didn't want to delay things any further,<br> >> I went ahead and<br> >> committed and thought I'd fix stuff if there were objections.I'll do that<br> >> now.<br> >><br> > <br> > So even w/o my change, I don't see the color output for the review states<br> > (so I can remove the<br> > general filter I added for color). That's easy enough. but what are you<br> > doing to get color in the<br> > current setup? Or is your arcanist install old and un-updated?<br> <br> Nope, built locally via poudriere back in October on 14-stable:<br> <br> > pkg info | grep arcan<br> arcanist-lib-php81-20220518_5 Libraries for the command line interface for Phabricator<br> arcanist-php81-20220518_5 Command line interface for Phabricator<br> <br> > ll /usr/local/poudriere/data/logs/bulk/14_0-20231022-ports/*/arcanist*<br> -rw-r--r-- 3 root wheel 16185 Oct 22 22:34 /usr/local/poudriere/data/logs/bulk/14_0-20231022-ports/latest-per-pkg/arcanist-lib-php81-20220518_5.log<br> -rw-r--r-- 3 root wheel 14152 Oct 22 22:56 /usr/local/poudriere/data/logs/bulk/14_0-20231022-ports/latest-per-pkg/arcanist-php81-20220518_5.log<br> <br> Can't show color arc list output via text e-mail, but it's color, and<br> git arc list is still color for me (from commit<br> 613aaf59afa307fc77c8eed01962a59423b1c5f3).<br> <br> arc list | more shows all the escape codes, but arc list | less -R<br> shows the colors just fine. This is in konsole with TERM=xterm256-color.<br> It also works fine for me in plain xterm under i3wm on my X1 carbon<br> running main from September with arcanist built in September.<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">I've had to add --ansi to get color in pipelines...</div><div dir="auto"><br></div><div>I'm using: the same version of arc too:</div><div>% arc version<br></div><div>arcanist-lib-php80 20220518_5 (devel/arcanist-lib)</div><div><br></div><div>and 'arc list' into a pipe never gives me color, but 'arc list --ansi' always does.</div><div><br></div><div>Though there's also arc list --noansi that would be easier than filtering the escape sequences.</div><div><br></div><div>In any event, I've posted a review <a href="https://reviews.freebsd.org/D43459">https://reviews.freebsd.org/D43459</a>; that should do the right thing.</div><div><br></div><div>Warner<br></div><div><br></div><div>Warner<br></div><div dir="auto"><br></div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> -- <br> John Baldwin<br> <br> </blockquote></div></div></div> </div>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfpSQhtWmn1_SC6-3D0ReTJh_J2Fu4JCVORMK5SubrgGuA>