Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Aug 2021 18:11:49 +0200] rev 47892
dirstate-item: fix the declaration of the Cext `from_v1_meth`
This method is apparently not called from anywhere since the declaration was
garbage.
We will start calling it in the next changeset.
Differential Revision: https://phab.mercurial-scm.org/D11317
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Aug 2021 22:30:30 +0200] rev 47891
dirstate-item: fix Cext declaration of dm_nonnormal and dm_otherparent
These are property, not method.
Differential Revision: https://phab.mercurial-scm.org/D11316
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Aug 2021 11:27:01 +0200] rev 47890
dirstatemap: replace `removefile` by an explicit `entry.set_untracked()`
All the other caller goes through `reset_state`, so we can safely have an
explicit method on `DirstateItem` object.
This means that all the logic to preserve the previous state (from p2, merged,
etc) is now properly encapsulated within the DirstateItem. This pave the way to
using different storage for these information.
Differential Revision: https://phab.mercurial-scm.org/D11315
Pierre-Yves David <pierre-yves.david@octobus.net> [Fri, 20 Aug 2021 11:23:52 +0200] rev 47889
dirstate: forward `remove` call to newer `API`
The `_remove` method was only called in the deprecated `remove` function. We
merge the two and express it in terms of call to new API methods.
Differential Revision: https://phab.mercurial-scm.org/D11314
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 30 Aug 2021 23:40:43 +0530] rev 47888
Added signature for changeset 86a60679cf61
Pulkit Goyal <7895pulkit@gmail.com> [Mon, 30 Aug 2021 23:40:37 +0530] rev 47887
Added tag 5.9.1 for changeset 86a60679cf61
Martin von Zweigbergk <martinvonz@google.com> [Fri, 27 Aug 2021 13:51:44 -0700] rev 47886
fix: again allow formatting the working copy while merging
I forgot about unfinished merges (I think I was thinking only about
unfinished merge conflicts) when I wrote
https://phab.mercurial-scm.org/D11209. As a coworker (hg contributor
dploch) reported to me, this led to `hg fix --working-dir` failing
when you have an uncommitted merge. The fix is trivial: just move the
assertion to just before the call to `scmutil.movedirstate()` where it
actually matters.
Differential Revision: https://phab.mercurial-scm.org/D11376
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 26 Aug 2021 21:40:21 -0700] rev 47885
pyoxidizer: add arch to PyOxidizer MSIs
This is the proper filename pattern. This filename format
wasn't properly implemented when PyOxidizer took over Python 3
MSI generation in 603efb3845ba.
Differential Revision: https://phab.mercurial-scm.org/D11359
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 26 Aug 2021 20:05:12 -0700] rev 47884
pyoxidizer: pass arch to WiXInstaller()
We just upgraded Windows automation to PyOxidizer 0.17.0. This
version of PyOxidizer changed the behavior of WiX installers so
installer architecture defaulted to "x64" (before it defaulted
to the target of the pyoxidizer.exe binary). To allow controlling
the architecture of the installer, the `arch` argument was added
to `WiXInstaller`. This commit passes that argument in.
Differential Revision: https://phab.mercurial-scm.org/D11358
Gregory Szorc <gregory.szorc@gmail.com> [Thu, 26 Aug 2021 20:01:01 -0700] rev 47883
contrib: install PyOxidizer 0.17.0
This pulls in some changes we want to improve Windows MSI installers.
This will need separate enhancements to the pyoxidizer.bzl. But those will
be handled in a separate changeset.
Differential Revision: https://phab.mercurial-scm.org/D11357