As stated in the issue5123, unshelve can destroy the second parent of
the context when tried to unshelve with an uncommitted merge. This
patch makes unshelve to abort when called with an uncommitted merge.

• • a/hgext/mq.py +++ b/hgext/mq.py @@ -3518,7 +3518,10 @@ delattr(self.unfiltered(), r'mq')
    
    def abortifwdirpatched(self, errmsg, force=False):
• if self.mq.applied and self.mq.checkapplied and not force: + shelveinprogress = any('shelvedstate' in state + for state in cmdutil.unfinishedstates) + if (self.mq.applied and self.mq.checkapplied and not force and + not shelveinprogress):

In D6164#89916, @indygreg wrote:

In D6164#89915, @durin42 wrote:

In D6164#89914, @indygreg wrote:

In D6164#89913, @durin42 wrote:

How about we add an argument to define the path(s) to the pip requirements file(s) to use? By default, it can use the requirements.txt in the repo. Would that solve your use case?

No, because I have some stuff which (out of tragic necessity at the moment) isn't pip installable, and I have to install it into the virtualenv by banging some rocks together. :(

Bleh. So you do need the power of a full script here.

In D6164#89915, @durin42 wrote:

In D6164#89914, @indygreg wrote:

In D6164#89913, @durin42 wrote:

How about we add an argument to define the path(s) to the pip requirements file(s) to use? By default, it can use the requirements.txt in the repo. Would that solve your use case?

No, because I have some stuff which (out of tragic necessity at the moment) isn't pip installable, and I have to install it into the virtualenv by banging some rocks together. :(

In D6164#89914, @indygreg wrote:

In D6164#89913, @durin42 wrote:

How about we add an argument to define the path(s) to the pip requirements file(s) to use? By default, it can use the requirements.txt in the repo. Would that solve your use case?

In D6164#89913, @durin42 wrote:

In D6164#89881, @indygreg wrote:

I like the flexibility. But I'm not super keen about the interface here. Using a script to inject custom options seems like it could be useful. But as it is currently implemented, the script simply prints out \0 delimited package names. So one UI wart is --extra-prebuild-script being a somewhat generic name but that script only emits package names. --extra-packages-script would be a better name.

Gentle ping for review.

Gentle ping for review.

@@ -231,8 +235,10 @@

    raise ValueError(
        r'node %s does not exist' % pycompat.sysstr(hex(node)))
self._entries.setdefault(label, []).append(node)

+ self._verifiedbranches.add(label)

def copy(self):
    """return an deep copy of the branchcache object"""

• return type(self)(
• self, self.tipnode, self.tiprev, self.filteredhash, + return branchcache( + self.entries, self.tipnode, self.tiprev, self.filteredhash, self._closednodes)

In D6142#89492, @mharbison72 wrote:

I don't know anything about PowerShell or AWS, but this series looks nice for making Windows easier to deal with.

What was the problem with python3 tests? I've been able to run them locally (though a bunch fail with py3 issues).