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

crecord: avoid duplicating lines when reverting noeol->eol change...

crecord: avoid duplicating lines when reverting noeol->eol change When reversing a patch that looks like this while using crecord: ``` @@ -301,4 +302,4 @@ zza zzb zzc zzd -zze \ No newline at end of file +zze ``` we would previously reverse the `-zze` line to be an add, encounter the "no newline" line and stop inspecting lines. This caused us to duplicate the line, producing `zzezze` (still without a newline). `break` is the correct action if we know there will be no lines afterwards, as would be the case in an eol -> noeol transition. It is incorrect if there are lines afterward, such as if both sides are missing the newline or if only the lhs is missing the newline. Differential Revision: https://phab.mercurial-scm.org/D12441

Gregory Szorc - - Load All Authors

File last commit:

r49730:6000f5b2 default


                r49910:079197e9

default

Download file

             reject_new_heads.py
        
                    40 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 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 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)
				)