upstream/mercurial-mirror Files · mercurial/thirdparty/zope/interface/_flatten.py

copies: distinguish between merged and touched files during upgrade...

copies: distinguish between merged and touched files during upgrade This a filenode being different between p1, p2 and result does not necessarily means a merges happens. For example p2 could be a strict newer version of p1, so the p2 version is picked by the manifest merging, but then the file is manually updated before the commit. In this case the file should be detected as touched. Differential Revision: https://phab.mercurial-scm.org/D10220

Gregory Szorc - - Load All Authors

File last commit:

r37195:68ee6182 default


                r47571:433cef8f

default

Download file

             _flatten.py
        
                    38 lines
            
             | 1.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / thirdparty / zope / interface / _flatten.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      ##############################################################################

      #

      # Copyright (c) 2002 Zope Foundation and Contributors.

      # All Rights Reserved.

      #

      # This software is subject to the provisions of the Zope Public License,

      # Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.

      # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED

      # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

      # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS

      # FOR A PARTICULAR PURPOSE.

      #

      ##############################################################################

      """Adapter-style interface registry

      See Adapter class.

      """

      from __future__ import absolute_import

      from .interface import Declaration

      def _flatten(implements, include_None=0):

          try:

              r = implements.flattened()

          except AttributeError:

              if implements is None:

                  r=()

              else:

                  r = Declaration(implements).flattened()

          if not include_None:

              return r

          r = list(r)

          r.append(None)

          return r

	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 (c) 2002 Zope Foundation and Contributors.
				# All Rights Reserved.
				#
				# This software is subject to the provisions of the Zope Public License,
				# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
				# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
				# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
				# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
				# FOR A PARTICULAR PURPOSE.
				#
				##############################################################################
				"""Adapter-style interface registry

				See Adapter class.
				"""

				from __future__ import absolute_import

				from .interface import Declaration

				def _flatten(implements, include_None=0):

				try:
				r = implements.flattened()
				except AttributeError:
				if implements is None:
				r=()
				else:
				r = Declaration(implements).flattened()

				if not include_None:
				return r

				r = list(r)
				r.append(None)
				return r