HomePhabricator

Backed out changeset 2f2107c01dee

Authored by Alphare.

Description

Backed out changeset 2f2107c01dee

Following discussion on the original Phabricator patch, we've agreed to back out
this change until Python 2 is dropped since it's simpler than figuring out why
the Python 2 version doesn't behave the same.

Event Timeline

martinvonz added inline comments.
/mercurial/dispatch.py
314–317

Could you revert this too, so the entire D11628 is reverted? Otherwise I think we'll see a failing test-chg.t on py2.

martinvonz added inline comments.Oct 19 2021, 11:04 AM
/mercurial/dispatch.py
314–317

Ah, looks like you already queued this. I think it would be better to send it as a proper patch next time. For now, can you back out each commit separately instead? I think that will be simpler and cleaner. Thanks

Alphare added inline comments.Oct 19 2021, 11:07 AM
/mercurial/dispatch.py
314–317

Oh, sorry, I though it would be better to not backout more than needed, so I added the difference for chg on Python 2 and 3.

I should have sent it for review, I'll do that next time. Do you want me to re-do the whole thing and backout both changesets or is the current state ok?

martinvonz added inline comments.Oct 19 2021, 11:10 AM
/mercurial/dispatch.py
314–317

Do you want me to re-do the whole thing and backout both changesets or is the current state ok?

I think you'll need to back out the entirety of commit 2f2107c0 and 8fae2cc6. I think it's clearer as two separate commits, but I don't mind if you prefer to squash them.

Alphare added inline comments.Oct 19 2021, 11:12 AM
/mercurial/dispatch.py
314–317

Just so I'm sure you've seen it, we don't strictly need (as in the functional result) to back out anything more since I've added the change for py2/py3.
But if you mean "I'd prefer the history to be two clean back out" then I can prune and re-do that.

martinvonz added inline comments.Oct 19 2021, 11:18 AM
/mercurial/dispatch.py
314–317

I don't quite follow what the state is right now, so from that perspective, I think it would be clearer to simply back out the two commits.

Alphare added inline comments.Oct 19 2021, 1:05 PM
/mercurial/dispatch.py
314–317

Sure, done in D11692 and D11693!