view hgext/hooklib/reject_merge_commits.py @ 46082:c80f9e3daec3

share: remove unexpected heading from "verbose" container in help test

`test-gendoc-*.t` have been failing for me since 91425656e2b1 (share:
add documentation about share-safe mode in `hg help -e share`,
2020-11-27) with this kind of output:

```
    --- /usr/local/google/home/martinvonz/hg/tests/test-gendoc-ru.t
    +++ /usr/local/google/home/martinvonz/hg/tests/test-gendoc-ru.t.err
    @@ -2,3 +2,9 @@

       $ $TESTDIR/check-gendoc ru
       checking for parse errors
    +  gendoc.txt:12818: (SEVERE/4) Unexpected section title.
    +
    +  Sharing requirements and configs of source repository with shares
    +  -----------------------------------------------------------------
    +  Exiting due to level-4 (SEVERE) system message.
    +  [1]
```

This patch fixes that.

Differential Revision: https://phab.mercurial-scm.org/D9552

# Copyright 2020 Joerg Sonnenberger <[e-mail]>
#
# 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 absolute_import

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
            )