| marmoute |
| hg-reviewers |
| No Linters Available |
| No Unit Test Coverage |
This hooks feel like a duplication of the experimental.experimental', b'single-head-per-branch config and I would rather see the experimental feature boosted with what might be missing than increasing the divergent duplication.
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/hooklib/reject_new_heads.py (15 lines) | |||
| M | tests/test-hooklib-reject_new_heads.t (58 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| 423cb450e722 | d658f1dff315 | Joerg Sonnenberger | May 18 2020, 7:57 PM |
| # Copyright 2020 Joerg Sonnenberger <joerg@bec.de> | # Copyright 2020 Joerg Sonnenberger <joerg@bec.de> | ||||
| # | # | ||||
| # This software may be used and distributed according to the terms of the | # This software may be used and distributed according to the terms of the | ||||
| # GNU General Public License version 2 or any later version. | # GNU General Public License version 2 or any later version. | ||||
| """reject_new_heads is a hook to check that branches touched by new changesets | """reject_new_heads is a hook to check that branches touched by new changesets | ||||
| have at most one open head. It can be used to enforce policies for | or phase transitions have at most one open head. It can be used to enforce policies | ||||
| merge-before-push or rebase-before-push. It does not handle pre-existing | for merge-before-push or rebase-before-push. It does not handle pre-existing | ||||
| hydras. | hydras. | ||||
| Usage: | Usage: | ||||
| [hooks] | [hooks] | ||||
| pretxnclose.reject_new_heads = \ | pretxnclose.reject_new_heads = \ | ||||
| python:hgext.hooklib.reject_new_heads.hook | python:hgext.hooklib.reject_new_heads.hook | ||||
| """ | """ | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial import ( | from mercurial import ( | ||||
| error, | error, | ||||
| pycompat, | pycompat, | ||||
| ) | ) | ||||
| def hook(ui, repo, hooktype, node=None, **kwargs): | def hook(ui, repo, hooktype, node=None, **kwargs): | ||||
| if hooktype != b"pretxnclose": | if hooktype != b"pretxnclose": | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'Unsupported hook type %r') % pycompat.bytestr(hooktype) | _(b'Unsupported hook type %r') % pycompat.bytestr(hooktype) | ||||
| ) | ) | ||||
| ctx = repo.unfiltered()[node] | ctx = repo.unfiltered()[node] | ||||
| branches = set() | branches = set() | ||||
| if ctx.rev(): | |||||
| for rev in repo.changelog.revs(start=ctx.rev()): | for rev in repo.changelog.revs(start=ctx.rev()): | ||||
| rev = repo[rev] | rev = repo[rev] | ||||
| branches.add(rev.branch()) | branches.add(rev.branch()) | ||||
| for revs, (old, new) in kwargs.get('changes', {b'phases': []})[b'phases']: | |||||
| for rev in revs: | |||||
| branches.add(repo.unfiltered()[rev].branch()) | |||||
| for branch in branches: | for branch in branches: | ||||
| if len(repo.revs("head() and not closed() and branch(%s)", branch)) > 1: | if len(repo.revs("head() and not closed() and branch(%s)", branch)) > 1: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _(b'Changes on branch %r resulted in multiple heads') | _(b'Changes on branch %r resulted in multiple heads') | ||||
| % pycompat.bytestr(branch) | % pycompat.bytestr(branch) | ||||
| ) | ) | ||||
| $ cat <<EOF >> $HGRCPATH | $ cat <<EOF >> $HGRCPATH | ||||
| > [extensions] | > [extensions] | ||||
| > hooklib = | > hooklib = | ||||
| > | > | ||||
| > [phases] | > [phases] | ||||
| > publish = False | > publish = False | ||||
| > EOF | > EOF | ||||
| $ hg init a | $ hg init a | ||||
| $ hg --cwd a debugbuilddag '.:parent.*parent' | $ hg --cwd a debugbuilddag '.:parent.*parent' | ||||
| $ hg --cwd a log -G | $ hg --cwd a log -G | ||||
| o changeset: 2:fa942426a6fd | o changeset: 2:fa942426a6fd | ||||
| | tag: tip | | tag: tip | ||||
| | parent: 0:1ea73414a91b | | parent: 0:1ea73414a91b | ||||
| | user: debugbuilddag | | user: debugbuilddag | ||||
| | date: Thu Jan 01 00:00:02 1970 +0000 | | date: Thu Jan 01 00:00:02 1970 +0000 | ||||
| | summary: r2 | | summary: r2 | ||||
| | | | | ||||
| | o changeset: 1:66f7d451a68b | | o changeset: 1:66f7d451a68b | ||||
| |/ user: debugbuilddag | |/ user: debugbuilddag | ||||
| | date: Thu Jan 01 00:00:01 1970 +0000 | | date: Thu Jan 01 00:00:01 1970 +0000 | ||||
| | summary: r1 | | summary: r1 | ||||
| | | | | ||||
| o changeset: 0:1ea73414a91b | o changeset: 0:1ea73414a91b | ||||
| tag: parent | tag: parent | ||||
| user: debugbuilddag | user: debugbuilddag | ||||
| date: Thu Jan 01 00:00:00 1970 +0000 | date: Thu Jan 01 00:00:00 1970 +0000 | ||||
| summary: r0 | summary: r0 | ||||
| $ hg init b | $ hg init b | ||||
| $ cat <<EOF >> b/.hg/hgrc | $ cat <<EOF >> b/.hg/hgrc | ||||
| > [hooks] | > [hooks] | ||||
| > pretxnclose.reject_new_heads = \ | > pretxnclose.reject_new_heads = \ | ||||
| > python:hgext.hooklib.reject_new_heads.hook | > python:hgext.hooklib.reject_new_heads.hook | ||||
| > EOF | > EOF | ||||
| $ hg --cwd b pull ../a | $ hg --cwd b pull ../a | ||||
| pulling from ../a | pulling from ../a | ||||
| requesting all changes | requesting all changes | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| error: pretxnclose.reject_new_heads hook failed: Changes on branch 'default' resulted in multiple heads | error: pretxnclose.reject_new_heads hook failed: Changes on branch 'default' resulted in multiple heads | ||||
| transaction abort! | transaction abort! | ||||
| rollback completed | rollback completed | ||||
| abort: Changes on branch 'default' resulted in multiple heads | abort: Changes on branch 'default' resulted in multiple heads | ||||
| [255] | [255] | ||||
| $ hg --cwd b pull ../a -r 1ea73414a91b | $ hg --cwd b pull ../a -r 66f7d451a68b | ||||
| pulling from ../a | pulling from ../a | ||||
| adding changesets | adding changesets | ||||
| adding manifests | adding manifests | ||||
| adding file changes | adding file changes | ||||
| added 1 changesets with 0 changes to 0 files | added 2 changesets with 0 changes to 0 files | ||||
| new changesets 1ea73414a91b (1 drafts) | new changesets 1ea73414a91b:66f7d451a68b (2 drafts) | ||||
| (run 'hg update' to get a working copy) | (run 'hg update' to get a working copy) | ||||
| $ hg --cwd b phase --public 66f7d451a68b | |||||
| $ hg --cwd b --config hooks.pretxnclose.reject_new_heads= pull ../a | |||||
| pulling from ../a | |||||
| searching for changes | |||||
| adding changesets | |||||
| adding manifests | |||||
| adding file changes | |||||
| added 1 changesets with 0 changes to 0 files (+1 heads) | |||||
| new changesets fa942426a6fd (1 drafts) | |||||
| (run 'hg heads' to see heads, 'hg merge' to merge) | |||||
| Test that pushing a draft change to a publishing server having the same | |||||
| change already still triggers the check on the phase transition. The | |||||
| changeset should remain as draft. | |||||
| $ cat <<EOF >> b/.hg/hgrc | |||||
| > [serve] | |||||
| > view = immutable | |||||
| > | |||||
| > [phases] | |||||
| > publish = True | |||||
| > EOF | |||||
| $ cat > web.conf << EOF | |||||
| > [paths] | |||||
| > / = * | |||||
| > | |||||
| > [web] | |||||
| > push_ssl = false | |||||
| > allow_push = * | |||||
| > EOF | |||||
| $ hg --cwd b serve --web-conf ../web.conf -p $HGPORT -d --pid-file ../hg.pid | |||||
| $ cat hg.pid >> $DAEMON_PIDS | |||||
| $ hg --cwd a push -f http://localhost:$HGPORT | |||||
| pushing to http://localhost:$HGPORT/ | |||||
| searching for changes | |||||
| no changes found | |||||
| remote: error: pretxnclose.reject_new_heads hook failed: Changes on branch 'default' resulted in multiple heads | |||||
| remote: Changes on branch 'default' resulted in multiple heads | |||||
| abort: push failed on remote | |||||
| [255] | |||||
| $ hg phase --cwd b fa942426a6fd | |||||
| 2: draft | |||||
| Cleanup. | |||||
| $ killdaemons.py | |||||