Thanks for accepting. As I have been puzzled by arc for many years now, is there a way to merge via the web UI? arc land D25129 on a shell tells me that Branch "D25129" does not exist in the local working copy, likely because I've reset stuff here.

In D25129#4083, @aklapper wrote:

Thanks for accepting. As I have been puzzled by arc for many years now, is there a way to merge via the web UI? arc land D25129 on a shell tells me that Branch "D25129" does not exist in the local working copy, likely because I've reset stuff here.

There is no way to merge from the web UI.

You don't need to pass the differential revision ID to the command like you've done above: arc land D25129. This is wrong because the first argument to arc land is the branch you want to land changes from.

To land changes, run the command arc land on the branch with the accepted changes. If you no longer have the changes, you can run arc patch D25129 to download the changes to a new branch, and then run arc land on that branch.

goddenrich subscribed.Apr 24 2023, 11:06

goddenrich added inline comments.

src/error/PhutilOpaqueEnvelope.php
62–71	I think early returns are much nicer

goddenrich added inline comments.Apr 24 2023, 11:08

src/error/PhutilOpaqueEnvelope.php
62–71	sorry if (!phutil_nonempty_string($string)) which makes me think we might want a phutil_isempty_string() so we aren't double negativing all over the place

In D25129#4130, @Dylsss wrote:

In D25129#4083, @aklapper wrote:

Thanks for accepting. As I have been puzzled by arc for many years now, is there a way to merge via the web UI? arc land D25129 on a shell tells me that Branch "D25129" does not exist in the local working copy, likely because I've reset stuff here.

There is no way to merge from the web UI.

Just for a point of clarification, Phorge can be configured to support landing revisions from the Web UI https://we.phorge.it/book/phorge/article/differential_land/

Whether or not we want to enable this for this Phorge install might be a separate discussion, but, this capability does exist

[OT]

In D25129#4130, @Dylsss wrote:

If you no longer have the changes, you can run arc patch D25129 to download the changes to a new branch, and then run arc land on that branch.

Thanks. :) However in practice I repeatedly get a 403.

Screenshot_20230425_101356-phorge-arc-fail.png (1×1 px, 147 KB)

valerio.bozzolan mentioned this in Z1: Phorge.Apr 25 2023, 09:04

In D25129#4183, @aklapper wrote:

Thanks. :) However in practice I repeatedly get a 403.

Sorry but at the moment it seems we have not enabled git authentication over HTTP.

I have this workaround for you:

add your public SSH key here: https://we.phorge.it/settings/user/aklapper/page/ssh/
set your git origin to ssh://git@we.phorge.it/source/arcanist.git
try again

Thank you so much

valerio.bozzolan mentioned this in T15000: Ad hoc setup tasks.Apr 25 2023, 10:11

Closed by commit rARC82d1abd4edd1: Fix PHP 8.1 "strlen(null)" exception in PhutilOpaqueEnvelope.php. · Explain WhyApr 25 2023, 13:40

This revision was automatically updated to reflect the committed changes.

aklapper added a commit: rARC82d1abd4edd1: Fix PHP 8.1 "strlen(null)" exception in PhutilOpaqueEnvelope.php.

@valerio.bozzolan: Thank you for your patience with me! :)