upstream/mercurial-mirror Files · hgext/hooklib/reject_merge_commits.py

typing: lock in correct changes from pytype 2023.04.11 -> 2023.06.16...

typing: lock in correct changes from pytype 2023.04.11 -> 2023.06.16 There were a handful of other changes to the pyi files generated when updating pytype locally (and jumping from python 3.8.0 to python 3.10.11), but they were not as clear (e.g. the embedded type in a list changing from `nothing` to `Any` or similar). These looked obviously correct, and agreed with PyCharm's thoughts on the signatures. Oddly, even though pytype starting inferring `obsutil._getfilteredreason()` as returning bytes, it (correctly) complained about the None path when it was typed that way. Instead, raise a ProgrammingError if an unhandled fate is calculated. (Currently, all possibilities are handled, so this isn't reachable unless another fate is added in the future.)

Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default


                r52708:460e8048

default

Download file

             reject_merge_commits.py
        
                    44 lines
            
             | 1.3 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / hooklib / reject_merge_commits.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # 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 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

                  )

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# 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 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
				)