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

merge-tools: when calling external merge tool, describe the resolve inputs...

merge-tools: when calling external merge tool, describe the resolve inputs It is a common complaint that a user will be running some operation (histedit, rebase, evolve, etc.), get into a merge-conflict situation, and not understand what they are seeing - it is possible that the merge tool is configured to display the hash, but it's difficult for most merge tools to display a good snippet of the description. In the worst case, configuring this template will lead to output that is immediately covered by a terminal application, maybe the user can hit ctrl-z to see it. In the common case, the output will be in a terminal window and a GUI program will start, and it should be possible to view both the terminal and the GUI program at the same time. Differential Revision: https://phab.mercurial-scm.org/D5094

Gregory Szorc - - Load All Authors

File last commit:

r37195:68ee6182 default


                r40512:86dfae98

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