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

cmdutil: fix newandmodified file accounting for --interactive commits...

cmdutil: fix newandmodified file accounting for --interactive commits `originalchunks` is a misleading name, because it only contains header objects, which are flattened to selected hunks by the filter function. As such, `chunks not in originalchunks` is always True and misleading, because hunk objects never compare equal to header objects. This change fixes the internal naming and removes the useless parameter from the method. This change also fixes issue6533, by considering the filtered headers, rather than the hunks, when determining new and modified files. If a file is renamed + edited, and the edited hunks are deselected (but the file is not), the filtered chunks will contain a header for the file (because it's .special()) but but no hunks. Differential Revision: https://phab.mercurial-scm.org/D10936

Joerg Sonnenberger - - Load All Authors

File last commit:

r44897:4cabeea6 default


                r48365:00ae1fb6

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