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

tests: use proctutil.stdout.write() instead of print() in test-extension.t...

tests: use proctutil.stdout.write() instead of print() in test-extension.t I was debugging this test failure on python3 + chg. I get the following hunk as test failure: ``` @@ -206,6 +206,18 @@ Check normal command's load order of ext 4) bar uipopulate 5) foo reposetup 5) bar reposetup + 4) foo uipopulate (chg !) + 4) bar uipopulate (chg !) + 4) foo uipopulate (chg !) + 4) bar uipopulate (chg !) + 4) foo uipopulate (chg !) + 4) bar uipopulate (chg !) + 4) foo uipopulate (chg !) + 4) bar uipopulate (chg !) + 4) foo uipopulate (chg !) + 4) bar uipopulate (chg !) + 5) foo reposetup (chg !) + 5) bar reposetup (chg !) 0:c24b9ac61126 ``` After hours of debugging and head scracthing, I figured out that something is wrong with output flushing. I initially switched the print() statements to ui.warn() but thanks to Yuya who suggested using procutil.stdout.write() instead.

Joerg Sonnenberger - - Load All Authors

File last commit:

r44897:4cabeea6 default


                r45520:a28d1eca

default

Download file

             reject_merge_commits.py
        
                    45 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 __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

                  )

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