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

phabricator: combine commit messages into the review when folding commits...

phabricator: combine commit messages into the review when folding commits No visible changes here, until an option to enable it is added to `phabsend`. This combines the Differential fields like Arcanist does, rather than simply concatenating the text blocks. Aside from populating everything properly in the web interface, Phabricator fails the review create/update if repeated fields are seen as would happen with simple concatenation. On the flip side, now that the Summary and Test Plan fields can contain data from multiple commits, we can't just join these fields together to determine if an amend is needed. If that were to happen, every single commit in the folded range would get amended with the combined commit message, which seems clearly wrong. Aside from making a minor assumption about the content of the Differential Revision field (it seems they allow some minor variances with spacing), this means that for folded reviews, you can't post it, go to the web page add a missing Test Plan, and then get it added to the commit message by re-posting it. I don't think that's a big deal. Differential Revision: https://phab.mercurial-scm.org/D8309

Joerg Sonnenberger - - Load All Authors

File last commit:

r44897:4cabeea6 default


                r45134:dbe9182c

default

Download file

             reject_new_heads.py
        
                    41 lines
            
             | 1.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / hooklib / reject_new_heads.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_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

      merge-before-push or rebase-before-push. It does not handle pre-existing

      hydras.

      Usage:

        [hooks]

        pretxnclose.reject_new_heads = \

          python:hgext.hooklib.reject_new_heads.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"pretxnclose":

              raise error.Abort(

                  _(b'Unsupported hook type %r') % pycompat.bytestr(hooktype)

              )

          ctx = repo.unfiltered()[node]

          branches = set()

          for rev in repo.changelog.revs(start=ctx.rev()):

              rev = repo[rev]

              branches.add(rev.branch())

          for branch in branches:

              if len(repo.revs("head() and not closed() and branch(%s)", branch)) > 1:

                  raise error.Abort(

                      _(b'Changes on branch %r resulted in multiple heads')

                      % pycompat.bytestr(branch)

                  )

	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_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
				merge-before-push or rebase-before-push. It does not handle pre-existing
				hydras.

				Usage:
				[hooks]
				pretxnclose.reject_new_heads = \
				python:hgext.hooklib.reject_new_heads.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"pretxnclose":
				raise error.Abort(
				_(b'Unsupported hook type %r') % pycompat.bytestr(hooktype)
				)
				ctx = repo.unfiltered()[node]
				branches = set()
				for rev in repo.changelog.revs(start=ctx.rev()):
				rev = repo[rev]
				branches.add(rev.branch())
				for branch in branches:
				if len(repo.revs("head() and not closed() and branch(%s)", branch)) > 1:
				raise error.Abort(
				_(b'Changes on branch %r resulted in multiple heads')
				% pycompat.bytestr(branch)
				)