Mercurial > hg
view hgext/hooklib/reject_merge_commits.py @ 52001:3af11f3e9980 default tip
zeroconf: fix a warning about a signature mismatch in a method override
Caught by PyCharm. It looks like the `hdr` arg is mostly unused (thus why it
was missing in some cases), so pass along an empty string where needed.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 13 Oct 2024 14:46:23 +0200 |
parents | f4733654f144 |
children |
line wrap: on
line source
# Copyright 2020 Joerg Sonnenberger <joerg@bec.de> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. """reject_merge_commits is a hook to check new changesets for merge commits. Merge commits are allowed only between different branches, i.e. merging a feature branch into the main development branch. This can be used to enforce policies for linear commit histories. Usage: [hooks] pretxnchangegroup.reject_merge_commits = \ python:hgext.hooklib.reject_merge_commits.hook """ from __future__ import annotations from mercurial.i18n import _ from mercurial import ( error, pycompat, ) def hook(ui, repo, hooktype, node=None, **kwargs): if hooktype != b"pretxnchangegroup": raise error.Abort( _(b'Unsupported hook type %r') % pycompat.bytestr(hooktype) ) ctx = repo.unfiltered()[node] for rev in repo.changelog.revs(start=ctx.rev()): rev = repo[rev] parents = rev.parents() if len(parents) < 2: continue if all(repo[p].branch() == rev.branch() for p in parents): raise error.Abort( _( b'%s rejected as merge on the same branch. ' b'Please consider rebase.' ) % rev )