Mercurial > evolve
annotate hgext3rd/__init__.py @ 6129:d3b77e5ee04e
rewriteutil: make sure to provide branch kwarg to tomemctx()
Earlier in this function we did extra[b'branch'] = head.branch(), so we
definitely want to take branch from head. But inside tomemctx(), there's an
`if branch is None` check that updates extra with wctx.branch(). That is not
what we need, so let's provide the correct branch again, as a separate keyword
argument, even though it's already correct in extra.
Other uses of tomemctx() already provide branch.
This patch could be on stable, but fixup series depends on it, and we're close
enough to a feature release, so this should be fine.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Tue, 15 Feb 2022 14:26:38 +0300 |
parents | 143c8e4dc22d |
children |
rev | line source |
---|---|
1806
9f42f819267b
evolve: move the extensions to 'hgext3rd'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 # name space package to host third party extensions |
1901
85390446f8c1
packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
2 from __future__ import absolute_import |
85390446f8c1
packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
3 import pkgutil |
85390446f8c1
packaging: fix setup.py and install as hgext3rd.topic
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
4 __path__ = pkgutil.extend_path(__path__, __name__) |