Anything recent. @ on https://mercurial-scm.org/hg is fine.

Patch still fails to apply. Would you please rebase it as requested?

I like this, but can see it being vaguely controversial so I'll only give it a +1 here for now - if I don't see objections in a few days I'll go ahead and land it.

Huh. That's strictly a bug, as debugwaitonrepack should actually be waiting.

I'd fix this one style nit in flight (this actually looks good), but it no longer applies - could you rebase it for me?

This is on Facebook's extensions repository, which I don't own. At this point, it probably makes sense to move p4fastimport to its own repository and maintain it there.

This is vendored code. Can you send it upstream?

In D5744#85436, @spectral wrote:

In D5744#85051, @yuja wrote:

I agree with that we would never set the commands.commit.interactive.{...}
in hgrc, but the feature itself is useful if you have to work on unclean
codebase unlike in Google. For example, I sometimes need to commit changes
ignoring unrelated whitespace cleanups made by editor or code formatter,
because I can't control the development workflow.

That's why I thought there would be users relying on the current behavior.

I think I understand what you're saying. I was under the impression that what we cared about was that hg record -b should continue working. Since there are no diffopts available on hg commit -i, you're thinking that this could be written as hg commit -i --config commands.commit.interactive.ignorews=1.

While I'm sympathetic to that argument, it is so long and unwieldy that I think I'd recommend that users just do hg --config extensions.record= record -b (or, more likely, set [extensions] record= in their hgrc).

I'll send the other patch series, we can discuss this on the relevant patches instead of keeping most of the discussion in a (somewhat unrelated) patch. I've sent D5832-D5834 with the config option approach, and still have D5877-D5878 as the "only respect commandline args" approach.

In D5744#84960, @spectral wrote:

In D5744#84938, @yuja wrote:

I did not add this to revert --interactive, since that does not currently have any way of getting args specified on the commandline that affect the whitespace settings (so I'm keeping revert --interactive *ignoring* the user's diff settings).

Well, hg revert --interactive does respect the user's diff settings. I don't
know why, but f37a69ec3f47 explicitly added whitespace=True.

If I had to guess, I think that was just a copy/paste from commit --interactive without realizing the consequences;

In D5749#84719, @mharbison72 wrote:

In D5749#84640, @indygreg wrote:

@durin42 and I were both able to produce intermittent failures with this change. Why, I'm not sure.

Does the Windows regression occur with this patch or with D5751? I ask because the behavior of socket.shutdown() is documented to vary by platform. I wouldn't at all be surprised if D5751 caused the regression seen here.

It was this patch.

Like I said, I’ve seen connection resets in the non-daemonized serve output (don’t recall if it was push, pull, or both). I thought it was weird, but there were no other signs of problems, so I wrote it off as some odd Windows thing. (Not sure that I’ve seen it on Linux or OS X too)

Oops. I'll be back to this.

I still don't love this, but I'm landing it to make forward progress on 3.7. :/