upstream/mercurial-mirror Files · hgext/hooklib/enforce_draft_commits.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

             enforce_draft_commits.py
        
                    45 lines
            
             | 1.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / hooklib / enforce_draft_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.

      """enforce_draft_commits us a hook to ensure that all new changesets are

      in the draft phase. This allows enforcing policies for work-in-progress

      changes in overlay repositories, i.e. a shared hidden repositories with

      different views for work-in-progress code and public history.

      Usage:

        [hooks]

        pretxnclose-phase.enforce_draft_commits = \

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

              raise error.Abort(

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

              )

          ctx = repo.unfiltered()[node]

          if kwargs['oldphase']:

              raise error.Abort(

                  _(b'Phase change from %r to %r for %s rejected')

                  % (

                      pycompat.bytestr(kwargs['oldphase']),

                      pycompat.bytestr(kwargs['phase']),

                      ctx,

                  )

              )

          elif kwargs['phase'] != b'draft':

              raise error.Abort(

                  _(b'New changeset %s in phase %r rejected')

                  % (ctx, pycompat.bytestr(kwargs['phase']))

              )

	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.

				"""enforce_draft_commits us a hook to ensure that all new changesets are
				in the draft phase. This allows enforcing policies for work-in-progress
				changes in overlay repositories, i.e. a shared hidden repositories with
				different views for work-in-progress code and public history.

				Usage:
				[hooks]
				pretxnclose-phase.enforce_draft_commits = \
				python:hgext.hooklib.enforce_draft_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"pretxnclose-phase":
				raise error.Abort(
				_(b'Unsupported hook type %r') % pycompat.bytestr(hooktype)
				)
				ctx = repo.unfiltered()[node]
				if kwargs['oldphase']:
				raise error.Abort(
				_(b'Phase change from %r to %r for %s rejected')
				% (
				pycompat.bytestr(kwargs['oldphase']),
				pycompat.bytestr(kwargs['phase']),
				ctx,
				)
				)
				elif kwargs['phase'] != b'draft':
				raise error.Abort(
				_(b'New changeset %s in phase %r rejected')
				% (ctx, pycompat.bytestr(kwargs['phase']))
				)