From nobody Tue Jan 16 02:35:36 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TDY5y5m7hz56PqP for ; Tue, 16 Jan 2024 02:35:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TDY5y2pvVz4c13 for ; Tue, 16 Jan 2024 02:35:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a293f2280c7so1095222166b.1 for ; Mon, 15 Jan 2024 18:35:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1705372548; x=1705977348; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=IUoFNklR5N0e9CeZuoOgNPinrLlorBhaBHtX00ONgpc=; b=WQD5MFqDRJ0XhMrUp78l2DArAwpuvsDARDhLnUSdYMyJ99am0dTd1vnp+cAcdiHa2T ndY0ntkhyVBmqPAHGtWAuPY9xL4VtN1V7eE6rZQZPk6jZwVM6mhIEDweA2cr2Wms7/uA 0m38dSDkCHJqqAA47quak5JIcyh4QRGDTHC/YIDEHNX4L4efGHDAUGPpsOwAqyJf24O7 JAiu3iomYlILBe6mgdiPRcxlAzHeRtXsUxoL8nEqZgiSWxRCf/MT2n+SJPghfO7ZLUPs a79cz+0cGb3R4paJUmZyMS/kUmo2Km8udqZ2xlG3zQD2YdMZMtJ+oU6RKGOurtQKWkTo hqug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705372548; x=1705977348; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=IUoFNklR5N0e9CeZuoOgNPinrLlorBhaBHtX00ONgpc=; b=EKqeQnad+eQvVAMzQx7Fcp/3iScwy+FJaVwxyvaTlL6d692zls9Iyk+mZ4307wdgo7 i8y0uhglgcvUL6J/cTQk3PaKrQmW94EFnSkMdpWzD8DQR1CEBQrK/6MHNS15vJ0ZQA43 eMW/hukwh+szGuWp4Ht12Vy9dp66HyvZc0HX27nZY/Ui7/SSZVXPbFCGgaY14QQV8Erq k5ArsJqwWx/1xJKw/Dxs+IGtuBR5TEQSfEXKI11+vTxPOL7+F0G8YNAlh4kpbiOg7V4s 75gt8O+xzNrr+mk77h1tPmRdVvn5f3eZs1BGDPPY44IqqVGawI+N+A0v4/d8htFDdHxG AgPw== X-Gm-Message-State: AOJu0YybjxiUvN4FWKM9OOyWBHIb8D1Hb251E2+MLN5WpI4UYTLIU/Do ZMrrzmLlnjWEDFSmbcNakZCg9I6pgUfluV6LUHjA00bI/wwdLQ== X-Google-Smtp-Source: AGHT+IE++9DKwo+lcFFBOo92HsjfJGXYRJKlk/UC3F4uO5kLkksMz3AUbOTYcHj601Up8rv9WMqR+/Uvi0QZcv/KKdY= X-Received: by 2002:a17:907:a705:b0:a2c:e4ab:1d61 with SMTP id vw5-20020a170907a70500b00a2ce4ab1d61mr1597816ejc.306.1705372548548; Mon, 15 Jan 2024 18:35:48 -0800 (PST) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202401150224.40F2OSBS093537@gitrepo.freebsd.org> <046cef05-668a-4ee9-a72a-09d7de303a46@FreeBSD.org> In-Reply-To: <046cef05-668a-4ee9-a72a-09d7de303a46@FreeBSD.org> From: Warner Losh Date: Mon, 15 Jan 2024 19:35:36 -0700 Message-ID: Subject: Re: git: df834e06bbc7 - main - git-arc: Just strip escape sequences form arc log To: John Baldwin Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000f759f2060f06fc9f" X-Rspamd-Queue-Id: 4TDY5y2pvVz4c13 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000f759f2060f06fc9f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Jan 15, 2024, 4:39=E2=80=AFPM John Baldwin wrote: > On 1/15/24 9:02 AM, Warner Losh wrote: > > Hey John, > > > > On Mon, Jan 15, 2024 at 9:37=E2=80=AFAM Warner Losh wr= ote: > > > >> > >> > >> On Mon, Jan 15, 2024 at 9:30=E2=80=AFAM John Baldwin = 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=3Ddf834e06bbc78c03cb6b35f074ae436= 73c9ce463 > >>>> > >>>> commit df834e06bbc78c03cb6b35f074ae43673c9ce463 > >>>> Author: Warner Losh > >>>> AuthorDate: 2024-01-15 02:22:04 +0000 > >>>> Commit: Warner Losh > >>>> 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 restore= s > 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, s= o > >>> 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 fo= r > >>> 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 stat= es > > (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/ar= canist-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/ar= canist-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=3Dxterm256-colo= r. > 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 --=20 > John Baldwin > > --000000000000f759f2060f06fc9f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Jan 15, 2024, 4:39=E2=80=AFPM= 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=E2=80=AFAM Warner Losh <imp@bsdimp.com= > wrote:
>
>>
>>
>> On Mon, Jan 15, 2024 at 9:30=E2=80=AFAM John Baldwin <jhb@freebs= d.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=3Ddf834e06bbc78c03cb6b35f074a= e43673c9ce463
>>>>
>>>> commit df834e06bbc78c03cb6b35f074ae43673c9ce463
>>>> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org= >
>>>> AuthorDate: 2024-01-15 02:22:04 +0000
>>>> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org= >
>>>> CommitDate: 2024-01-15 02:23:45 +0000
>>>>
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0git-arc: Just strip escape seque= nces form arc log
>>>>
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Just strip escape sequences and = Warning: lines from 'arc list'
>>> output. I
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0upgraded and they changed and gi= t arc list broke. This restores its
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0functionality.
>>>>
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Note: jhb didn't like this, = so if others object, I'll fix...
>>>>
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0Netflix
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 markj
>>>>=C2=A0 =C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 https://reviews.freebsd.org/D36553
>>>
>>> Namely, it breaks the color output for reviews in different st= ates, so
>>> Needs Review
>>> shows up as purple, Approved as green, etc.=C2=A0 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 s= cope can
>> be reduced.
>> The trouble is that it's at the first for the other things I c= ommitted 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 ar= e 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=C2=A0 Libraries for the command line interfac= e for Phabricator
arcanist-php81-20220518_5=C2=A0 =C2=A0 =C2=A0 Command line interface for Ph= abricator

> ll /usr/local/poudriere/data/logs/bulk/14_0-20231022-ports/*/arcanist*=
-rw-r--r--=C2=A0 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--=C2=A0 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>
Can't show color arc list output via text e-mail, but it's color, a= nd
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.=C2=A0 This is in konsole with TERM=3Dxterm256-c= olor.
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 t= o 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 &= #39;arc list --ansi' always does.

Though there= 's also arc list --noansi that would be easier than filtering the escap= e sequences.

In any event, I've posted a revie= w https://reviews.freebsd.or= g/D43459 that should do the right thing.

Warne= r

Warner

=
--
John Baldwin

--000000000000f759f2060f06fc9f--