Mercurial > hg
view tests/test-hooklib-reject_merge_commits.t @ 49781:f4a363b25859 stable
extensions: load help from hgext.__index__ as a fallback this time
Prior to 843418dc0b1b, `hgext.__index__` was consulted first if present, which
caused the longer help from the extension modules to be ignored, even when
available. But that change causes a bunch of test failures when the pyoxidized
binary bundles *.pyc in the binary, saying the there's no help topic for
`hg help $disabled_extension` and suggesting the use of `--keyword`, rather than
showing a summary and indicating that it is disabled. Current failures were in
test-check-help.t, test-extension.t, test-help.t, and test-qrecord.t.
Ideally, we would read the various *.pyc files from memory and slurp in the
docstring, but I know that they used to not be readable as resources, and I
can't figure out how to make it work now. So maybe 3.9 and/or the current
PyOxidizer doesn't support it yet. I got closer in py2exe with
`importlib.resources.open_binary("hgext", "rebase.pyc")`, but `open_binary()` on
*.pyc fails in pyoxidizer.[1] Either way, the *.pyc can't be passed to
`ast.parse()` as `extensions._disabledcmdtable()` is doing, so I'm setting that
aside for now.
[1] https://github.com/indygreg/PyOxidizer/issues/649
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 05 Dec 2022 16:05:04 -0500 |
parents | 4cabeea6d214 |
children |
line wrap: on
line source
$ cat <<EOF >> $HGRCPATH > [extensions] > hooklib = > > [phases] > publish = False > EOF $ hg init a $ hg --cwd a debugbuilddag '.:parent.:childa*parent/childa<parent@otherbranch./childa' $ hg --cwd a log -G o changeset: 4:a9fb040caedd |\ branch: otherbranch | | tag: tip | | parent: 3:af739dfc49b4 | | parent: 1:66f7d451a68b | | user: debugbuilddag | | date: Thu Jan 01 00:00:04 1970 +0000 | | summary: r4 | | | o changeset: 3:af739dfc49b4 | | branch: otherbranch | | parent: 0:1ea73414a91b | | user: debugbuilddag | | date: Thu Jan 01 00:00:03 1970 +0000 | | summary: r3 | | +---o changeset: 2:a6b287721c3b | |/ parent: 0:1ea73414a91b | | parent: 1:66f7d451a68b | | user: debugbuilddag | | date: Thu Jan 01 00:00:02 1970 +0000 | | summary: r2 | | o | changeset: 1:66f7d451a68b |/ tag: childa | user: debugbuilddag | date: Thu Jan 01 00:00:01 1970 +0000 | summary: r1 | o changeset: 0:1ea73414a91b tag: parent user: debugbuilddag date: Thu Jan 01 00:00:00 1970 +0000 summary: r0 $ hg init b $ cat <<EOF >> b/.hg/hgrc > [hooks] > pretxnchangegroup.reject_merge_commits = \ > python:hgext.hooklib.reject_merge_commits.hook > EOF $ hg --cwd b pull ../a -r a6b287721c3b pulling from ../a adding changesets adding manifests adding file changes error: pretxnchangegroup.reject_merge_commits hook failed: a6b287721c3b rejected as merge on the same branch. Please consider rebase. transaction abort! rollback completed abort: a6b287721c3b rejected as merge on the same branch. Please consider rebase. [255] $ hg --cwd b pull ../a -r 1ea73414a91b pulling from ../a adding changesets adding manifests adding file changes added 1 changesets with 0 changes to 0 files new changesets 1ea73414a91b (1 drafts) (run 'hg update' to get a working copy) $ hg --cwd b pull ../a -r a9fb040caedd pulling from ../a searching for changes adding changesets adding manifests adding file changes added 3 changesets with 0 changes to 0 files new changesets 66f7d451a68b:a9fb040caedd (3 drafts) (run 'hg update' to get a working copy)